diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-09-29 23:35:09 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-09-29 23:35:09 +0100 |
| commit | 35259892b8f23940a717565443204b9f7fac5404 (patch) | |
| tree | 0dcac2a453ce12301687048990c6292c9724d335 | |
| parent | fbc0f13b2bb1e9c54112d881ab7bfde6df35e8dc (diff) | |
| parent | 720676542e0bff23f46fd74082d473d0aed26343 (diff) | |
| download | Essentials-35259892b8f23940a717565443204b9f7fac5404.tar Essentials-35259892b8f23940a717565443204b9f7fac5404.tar.gz Essentials-35259892b8f23940a717565443204b9f7fac5404.tar.lz Essentials-35259892b8f23940a717565443204b9f7fac5404.tar.xz Essentials-35259892b8f23940a717565443204b9f7fac5404.zip | |
Merge branch '2.9' of github.com:essentials/Essentials into 2.9
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/signs/SignKit.java | 2 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/signs/SignWarp.java | 2 |
2 files changed, 2 insertions, 2 deletions
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); 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 |