From 69cd17a1b181067fc45f1b223bdd323e8dc47079 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sat, 29 Sep 2012 03:59:31 +0100 Subject: [PATCH 1/3] Should fix tpaccept charge bug - needs testing --- .../src/com/earth2me/essentials/commands/Commandtpaccept.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java index 86f88f884..3f52e8e01 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java @@ -72,5 +72,6 @@ public class Commandtpaccept extends EssentialsCommand target.getTeleport().teleport(user, charge, TeleportCause.COMMAND); } user.requestTeleport(null, false); + throw new NoChargeException(); } } From cd7be1bb868860ca3cc5de668efd0aeedb070834 Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Sat, 29 Sep 2012 15:55:47 +0300 Subject: [PATCH 2/3] update warp sign permission check --- Essentials/src/com/earth2me/essentials/signs/SignWarp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/com/earth2me/essentials/signs/SignWarp.java b/Essentials/src/com/earth2me/essentials/signs/SignWarp.java index 8f470bc6b..eb81ea4e1 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignWarp.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignWarp.java @@ -53,7 +53,7 @@ public class SignWarp extends EssentialsSign if ((!group.isEmpty() && ("§2Everyone".equals(group) || player.inGroup(group))) - || (group.isEmpty() && (!ess.getSettings().getPerWarpPermission() || player.isAuthorized("essentials.warp." + warpName)))) + || (group.isEmpty() && (!ess.getSettings().getPerWarpPermission() || player.isAuthorized("essentials.warps." + warpName)))) { final Trade charge = getTrade(sign, 3, ess); try From 21cb8efb90580a3b7550c714494918d7e4e1f9d2 Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Sat, 29 Sep 2012 15:57:31 +0300 Subject: [PATCH 3/3] update kit sign permission check --- Essentials/src/com/earth2me/essentials/signs/SignKit.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/com/earth2me/essentials/signs/SignKit.java b/Essentials/src/com/earth2me/essentials/signs/SignKit.java index aee1d7dea..1c3528a18 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignKit.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignKit.java @@ -51,7 +51,7 @@ public class SignKit extends EssentialsSign final String kitName = sign.getLine(1).toLowerCase(Locale.ENGLISH).trim(); final String group = sign.getLine(2); if ((!group.isEmpty() && ("§2Everyone".equals(group) || player.inGroup(group))) - || (group.isEmpty() && (player.isAuthorized("essentials.kit." + kitName)))) + || (group.isEmpty() && (player.isAuthorized("essentials.kits." + kitName)))) { final Trade charge = getTrade(sign, 3, ess); charge.isAffordableFor(player);