Allow ignore to block tpahere requests.

khobbits · khobbits · commit 5d1ea4aa88c2 · 2013-11-09T04:08:25.000Z
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java
@@ -34,13 +34,16 @@ public void run(final Server server, final User user, final String commandLabel,
 		{
 			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()));
 	}

Original file line number	Diff line number	Diff line change
`@@ -34,13 +34,16 @@ public void run(final Server server, final User user, final String commandLabel,`
`34`	`34`	`{`
`35`	`35`	`throw new Exception(_("noPerm", "essentials.worlds." + user.getWorld().getName()));`
`36`	`36`	`}`
`37`		`- player.requestTeleport(user, true);`
`38`		`- player.sendMessage(_("teleportHereRequest", user.getDisplayName()));`
`39`		`- player.sendMessage(_("typeTpaccept"));`
`40`		`- player.sendMessage(_("typeTpdeny"));`
`41`		`- if (ess.getSettings().getTpaAcceptCancellation() != 0)`
	`37`	`+ if (!player.isIgnoredPlayer(user))`
`42`	`38`	`{`
`43`		`- player.sendMessage(_("teleportRequestTimeoutInfo", ess.getSettings().getTpaAcceptCancellation()));`
	`39`	`+ player.requestTeleport(user, true);`
	`40`	`+ player.sendMessage(_("teleportHereRequest", user.getDisplayName()));`
	`41`	`+ player.sendMessage(_("typeTpaccept"));`
	`42`	`+ player.sendMessage(_("typeTpdeny"));`
	`43`	`+ if (ess.getSettings().getTpaAcceptCancellation() != 0)`
	`44`	`+ {`
	`45`	`+ player.sendMessage(_("teleportRequestTimeoutInfo", ess.getSettings().getTpaAcceptCancellation()));`
	`46`	`+ }`
`44`	`47`	`}`
`45`	`48`	`user.sendMessage(_("requestSent", player.getDisplayName()));`
`46`	`49`	`}`