From a836576211b1fe7b027d903a384b56a9f2852eac Mon Sep 17 00:00:00 2001 From: KHobbits Date: Mon, 20 Aug 2012 08:41:22 +0100 Subject: Reorder perm check in antibuild --- .../essentials/antibuild/EssentialsAntiBuildListener.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java') 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")); } -- cgit v1.2.3