summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-02-11 12:06:42 -0800
committerKHobbits <rob@khobbits.co.uk>2012-02-11 12:06:42 -0800
commit6b5eb9417640f778d35419a3a1a35a1309efc529 (patch)
treeb6ed16cb4061441464abb750be700d50484172f2
parent0fb981a56d9d8ebf82ec66dd8d8999e4d9ab74d1 (diff)
parent62b354a989e3023d8463d1309d941cbaf776a5f3 (diff)
downloadEssentials-6b5eb9417640f778d35419a3a1a35a1309efc529.tar
Essentials-6b5eb9417640f778d35419a3a1a35a1309efc529.tar.gz
Essentials-6b5eb9417640f778d35419a3a1a35a1309efc529.tar.lz
Essentials-6b5eb9417640f778d35419a3a1a35a1309efc529.tar.xz
Essentials-6b5eb9417640f778d35419a3a1a35a1309efc529.zip
Merge pull request #45 from Wolvereness/master
Fix /tpaccept permission check Refactoring to follow.
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
index 2e3e024a3..456a77c37 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
@@ -22,7 +22,7 @@ public class Commandtpaccept extends EssentialsCommand
final User target = user.getTeleportRequest();
if (target == null
|| target.getBase() instanceof OfflinePlayer
- || (user.isTeleportRequestHere() && !target.isAuthorized("essentials.tpahere")))
+ || (user.isTeleportRequestHere() ? !target.isAuthorized("essentials.tpahere") : !target.isAuthorized("essentials.tpa")))
{
throw new Exception(_("noPendingRequest"));
}