summaryrefslogtreecommitdiffstats
path: root/EssentialsProtect/src
diff options
context:
space:
mode:
authorementalo <suror@gmx.co.uk>2012-01-23 15:48:56 +0000
committerementalo <suror@gmx.co.uk>2012-01-23 15:48:56 +0000
commit3b935a2628f5b9c441b5a375cbebd24f780e6c57 (patch)
tree66ac51e2a241856967f5c038081fb0522cb4325e /EssentialsProtect/src
parent84fc2887e3bb2230ac4409797ceb2ccbcc82a241 (diff)
downloadEssentials-3b935a2628f5b9c441b5a375cbebd24f780e6c57.tar
Essentials-3b935a2628f5b9c441b5a375cbebd24f780e6c57.tar.gz
Essentials-3b935a2628f5b9c441b5a375cbebd24f780e6c57.tar.lz
Essentials-3b935a2628f5b9c441b5a375cbebd24f780e6c57.tar.xz
Essentials-3b935a2628f5b9c441b5a375cbebd24f780e6c57.zip
Add new permission essentials.protect.alerts.notrigger
If user has this permisson they do not trigger EssProtect block alerts
Diffstat (limited to 'EssentialsProtect/src')
-rw-r--r--EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java6
-rw-r--r--EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java1
2 files changed, 5 insertions, 2 deletions
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
index c193561db..8e5e9cca8 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
@@ -51,7 +51,8 @@ public class EssentialsProtectBlockListener implements Listener
return;
}
- if (prot.checkProtectionItems(ProtectConfig.alert_on_placement, id))
+ if (!user.hasPermission("essentials.protect.alerts.notrigger")
+ && prot.checkProtectionItems(ProtectConfig.alert_on_placement, id))
{
prot.getEssentialsConnect().alert(user, blockPlaced.getType().toString(), _("alertPlaced"));
}
@@ -249,7 +250,8 @@ public class EssentialsProtectBlockListener implements Listener
}
final Material type = block.getType();
- if (prot.checkProtectionItems(ProtectConfig.alert_on_break, typeId))
+ if (!user.hasPermission("essentials.protect.alerts.notrigger")
+ && prot.checkProtectionItems(ProtectConfig.alert_on_break, typeId))
{
prot.getEssentialsConnect().alert(user, type.toString(), _("alertBroke"));
}
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java
index 401bf345d..6e515e56d 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java
@@ -83,6 +83,7 @@ public class EssentialsProtectPlayerListener implements Listener
}
}
if (item != null
+ && !user.hasPermission("essentials.protect.alerts.notrigger")
&& prot.checkProtectionItems(ProtectConfig.alert_on_use, item.getTypeId()))
{
prot.getEssentialsConnect().alert(user, item.getType().toString(), _("alertUsed"));