diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-08-19 15:54:12 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-08-19 16:08:36 +0100 |
| commit | b839fbaf3442079bcf8282f95f15437b0a44cf11 (patch) | |
| tree | e0d6a676736bf61a929ca3df33eac33d228a9a25 /EssentialsAntiBuild/src | |
| parent | d4df6e434cf86971a6c431a37315c0cf7ee5a84e (diff) | |
| download | Essentials-b839fbaf3442079bcf8282f95f15437b0a44cf11.tar Essentials-b839fbaf3442079bcf8282f95f15437b0a44cf11.tar.gz Essentials-b839fbaf3442079bcf8282f95f15437b0a44cf11.tar.lz Essentials-b839fbaf3442079bcf8282f95f15437b0a44cf11.tar.xz Essentials-b839fbaf3442079bcf8282f95f15437b0a44cf11.zip | |
Correct antibuild perm check
(still need to abort interact/use checks on block place)
Diffstat (limited to 'EssentialsAntiBuild/src')
| -rw-r--r-- | EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java b/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java index 28e6797ac..8832ee630 100644 --- a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java +++ b/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java @@ -36,7 +36,7 @@ public class EssentialsAntiBuildListener implements Listener private boolean metaPermCheck(User user, String action, int blockId, byte data) { - String blockPerm = "essentials.build." + action + blockId; + String blockPerm = "essentials.build." + action + "." + blockId; String dataPerm = blockPerm + ":" + data; if (user.isAuthorized(dataPerm)) @@ -66,7 +66,7 @@ public class EssentialsAntiBuildListener implements Listener final User user = ess.getUser(event.getPlayer()); if (prot.getSettingBool(AntiBuildConfig.disable_build) && !user.canBuild() && !user.isAuthorized("essentials.build") - && metaPermCheck(user, "place", event.getBlock())) + && !metaPermCheck(user, "place", event.getBlock())) { event.setCancelled(true); return; @@ -98,7 +98,7 @@ public class EssentialsAntiBuildListener implements Listener final User user = ess.getUser(event.getPlayer()); if (prot.getSettingBool(AntiBuildConfig.disable_build) && !user.canBuild() && !user.isAuthorized("essentials.build") - && metaPermCheck(user, "break", event.getBlock())) + && !metaPermCheck(user, "break", event.getBlock())) { event.setCancelled(true); return; @@ -191,7 +191,7 @@ public class EssentialsAntiBuildListener implements Listener if (prot.getSettingBool(AntiBuildConfig.disable_use) && !user.canBuild() && !user.isAuthorized("essentials.interact") && !user.isAuthorized("essentials.build")) { - if (metaPermCheck(user, "interact", event.getClickedBlock())) + if (!metaPermCheck(user, "interact", event.getClickedBlock())) { event.setUseInteractedBlock(Result.DENY); if (ess.getSettings().warnOnBuildDisallow()) @@ -199,7 +199,7 @@ public class EssentialsAntiBuildListener implements Listener user.sendMessage(_("buildAlert")); } } - if (event.hasItem() && metaPermCheck(user, "interact", event.getItem().getTypeId(), event.getItem().getData().getData())) + if (event.hasItem() && !metaPermCheck(user, "use", event.getItem().getTypeId(), event.getItem().getData().getData())) { event.setUseItemInHand(Result.DENY); } |