From 792f70efa5f3a47f642360e97979fe841593384c Mon Sep 17 00:00:00 2001 From: snowleo Date: Fri, 20 Jan 2012 05:20:37 +0100 Subject: Update for new CraftBukkit Event Code EssentialsSpawn can't be updated yet, because the new event system lacks dynamic priorities. --- .../essentials/protect/EssentialsProtectPlayerListener.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java') diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java index ad7831a53..6b49e70d8 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java @@ -5,13 +5,15 @@ import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.User; import org.bukkit.Material; import org.bukkit.block.Block; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerInteractEvent; -import org.bukkit.event.player.PlayerListener; import org.bukkit.inventory.ItemStack; -public class EssentialsProtectPlayerListener extends PlayerListener +public class EssentialsProtectPlayerListener implements Listener { private final transient IProtect prot; private final transient IEssentials ess; @@ -22,7 +24,7 @@ public class EssentialsProtectPlayerListener extends PlayerListener this.ess = prot.getEssentialsConnect().getEssentials(); } - @Override + @EventHandler(priority = EventPriority.HIGHEST) public void onPlayerInteract(final PlayerInteractEvent event) { // Do not return if cancelled, because the interact event has 2 cancelled states. -- cgit v1.2.3 From e46fe381b4610d6a784922fe0bfc1bdca963d7c3 Mon Sep 17 00:00:00 2001 From: snowleo Date: Fri, 20 Jan 2012 05:52:35 +0100 Subject: Removing load info, bucket displays that now. --- .../earth2me/essentials/protect/EssentialsProtectPlayerListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java') diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java index 6b49e70d8..401bf345d 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java @@ -24,7 +24,7 @@ public class EssentialsProtectPlayerListener implements Listener this.ess = prot.getEssentialsConnect().getEssentials(); } - @EventHandler(priority = EventPriority.HIGHEST) + @EventHandler(priority = EventPriority.LOW) public void onPlayerInteract(final PlayerInteractEvent event) { // Do not return if cancelled, because the interact event has 2 cancelled states. -- cgit v1.2.3 From f93769dd1dd11ef30c77dd6c9e0e5cf275052715 Mon Sep 17 00:00:00 2001 From: ementalo Date: Mon, 23 Jan 2012 15:48:56 +0000 Subject: Add new permission essentials.protect.alerts.notrigger If user has this permisson they do not trigger EssProtect block alerts --- .../com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java | 1 + 1 file changed, 1 insertion(+) (limited to 'EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java') 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")); -- cgit v1.2.3