diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-08-20 08:41:22 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-08-20 08:41:22 +0100 |
| commit | aa2fdf7b402cd185df9a0e8a0f6f5aa7ac27a6c0 (patch) | |
| tree | 5122651b61f07be038f16d5285cde5ebc3420942 /EssentialsAntiBuild/src/com/earth2me/essentials | |
| parent | cc3591564dd0557de98fe0873f429f882e27aee4 (diff) | |
| download | Essentials-aa2fdf7b402cd185df9a0e8a0f6f5aa7ac27a6c0.tar Essentials-aa2fdf7b402cd185df9a0e8a0f6f5aa7ac27a6c0.tar.gz Essentials-aa2fdf7b402cd185df9a0e8a0f6f5aa7ac27a6c0.tar.lz Essentials-aa2fdf7b402cd185df9a0e8a0f6f5aa7ac27a6c0.tar.xz Essentials-aa2fdf7b402cd185df9a0e8a0f6f5aa7ac27a6c0.zip | |
Reorder perm check in antibuild
Diffstat (limited to 'EssentialsAntiBuild/src/com/earth2me/essentials')
| -rw-r--r-- | EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java b/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java index 9ce4f58f6..3c5d9b889 100644 --- a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java +++ b/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java @@ -85,8 +85,8 @@ public class EssentialsAntiBuildListener implements Listener return; } - if (!user.isAuthorized("essentials.protect.alerts.notrigger") - && prot.checkProtectionItems(AntiBuildConfig.alert_on_placement, id)) + if (prot.checkProtectionItems(AntiBuildConfig.alert_on_placement, id) + && !user.isAuthorized("essentials.protect.alerts.notrigger")) { prot.getEssentialsConnect().alert(user, blockPlaced.getType().toString(), _("alertPlaced")); } @@ -122,8 +122,8 @@ public class EssentialsAntiBuildListener implements Listener } final Material type = block.getType(); - if (!user.isAuthorized("essentials.protect.alerts.notrigger") - && prot.checkProtectionItems(AntiBuildConfig.alert_on_break, typeId)) + if (prot.checkProtectionItems(AntiBuildConfig.alert_on_break, typeId) + && !user.isAuthorized("essentials.protect.alerts.notrigger")) { prot.getEssentialsConnect().alert(user, type.toString(), _("alertBroke")); } @@ -190,8 +190,8 @@ public class EssentialsAntiBuildListener implements Listener } if (item != null - && !user.isAuthorized("essentials.protect.alerts.notrigger") - && prot.checkProtectionItems(AntiBuildConfig.alert_on_use, item.getTypeId())) + && prot.checkProtectionItems(AntiBuildConfig.alert_on_use, item.getTypeId()) + && !user.isAuthorized("essentials.protect.alerts.notrigger")) { prot.getEssentialsConnect().alert(user, item.getType().toString(), _("alertUsed")); } |