summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-11-09 04:08:25 +0000
committerKHobbits <rob@khobbits.co.uk>2013-11-09 04:08:25 +0000
commit5d1ea4aa88c2cc5f50e47e95be8626c3a9eff0c9 (patch)
treeb3253ab23cb98342dbd7941a40c36ae14207dbd0
parent7f8d62be02e5f04595776c25323514842a179c0d (diff)
downloadEssentials-5d1ea4aa88c2cc5f50e47e95be8626c3a9eff0c9.tar
Essentials-5d1ea4aa88c2cc5f50e47e95be8626c3a9eff0c9.tar.gz
Essentials-5d1ea4aa88c2cc5f50e47e95be8626c3a9eff0c9.tar.lz
Essentials-5d1ea4aa88c2cc5f50e47e95be8626c3a9eff0c9.tar.xz
Essentials-5d1ea4aa88c2cc5f50e47e95be8626c3a9eff0c9.zip
Allow ignore to block tpahere requests.
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java15
1 files changed, 9 insertions, 6 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java
index 114e16dec..7bfdb7278 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java
@@ -34,13 +34,16 @@ public class Commandtpahere extends EssentialsCommand
{
throw new Exception(_("noPerm", "essentials.worlds." + user.getWorld().getName()));
}
- player.requestTeleport(user, true);
- player.sendMessage(_("teleportHereRequest", user.getDisplayName()));
- player.sendMessage(_("typeTpaccept"));
- player.sendMessage(_("typeTpdeny"));
- if (ess.getSettings().getTpaAcceptCancellation() != 0)
+ if (!player.isIgnoredPlayer(user))
{
- player.sendMessage(_("teleportRequestTimeoutInfo", ess.getSettings().getTpaAcceptCancellation()));
+ player.requestTeleport(user, true);
+ player.sendMessage(_("teleportHereRequest", user.getDisplayName()));
+ player.sendMessage(_("typeTpaccept"));
+ player.sendMessage(_("typeTpdeny"));
+ if (ess.getSettings().getTpaAcceptCancellation() != 0)
+ {
+ player.sendMessage(_("teleportRequestTimeoutInfo", ess.getSettings().getTpaAcceptCancellation()));
+ }
}
user.sendMessage(_("requestSent", player.getDisplayName()));
}