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
commita9e62516bc63d5f7c0e73a8169f46d2a593da901 (patch)
tree9dcd05672362552a3d1ebcf101aa3e6a31099b81
parentd720911128c7ae8378ab39d8354944cbd151ebfe (diff)
downloadEssentials-a9e62516bc63d5f7c0e73a8169f46d2a593da901.tar
Essentials-a9e62516bc63d5f7c0e73a8169f46d2a593da901.tar.gz
Essentials-a9e62516bc63d5f7c0e73a8169f46d2a593da901.tar.lz
Essentials-a9e62516bc63d5f7c0e73a8169f46d2a593da901.tar.xz
Essentials-a9e62516bc63d5f7c0e73a8169f46d2a593da901.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()));
}