From a9e62516bc63d5f7c0e73a8169f46d2a593da901 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sat, 9 Nov 2013 04:08:25 +0000 Subject: Allow ignore to block tpahere requests. --- .../com/earth2me/essentials/commands/Commandtpahere.java | 15 +++++++++------ 1 file 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())); } -- cgit v1.2.3