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. --- .../protect/EssentialsProtectEntityListener.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java') diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java index 89167b2b9..40167ec41 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java @@ -8,12 +8,15 @@ import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.entity.*; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.entity.EntityTargetEvent.TargetReason; import org.bukkit.event.entity.*; -public class EssentialsProtectEntityListener extends EntityListener +public class EssentialsProtectEntityListener implements Listener { private final transient IProtect prot; private final transient IEssentials ess; @@ -24,7 +27,7 @@ public class EssentialsProtectEntityListener extends EntityListener this.ess = prot.getEssentialsConnect().getEssentials(); } - @Override + @EventHandler(priority = EventPriority.HIGHEST) public void onEntityDamage(final EntityDamageEvent event) { if (event.isCancelled()) @@ -189,7 +192,7 @@ public class EssentialsProtectEntityListener extends EntityListener } } - @Override + @EventHandler(priority = EventPriority.HIGHEST) public void onEntityExplode(final EntityExplodeEvent event) { if (event.isCancelled()) @@ -261,7 +264,7 @@ public class EssentialsProtectEntityListener extends EntityListener } } - @Override + @EventHandler(priority = EventPriority.HIGHEST) public void onCreatureSpawn(final CreatureSpawnEvent event) { if (event.getEntity() instanceof Player) @@ -288,7 +291,7 @@ public class EssentialsProtectEntityListener extends EntityListener } } - @Override + @EventHandler(priority = EventPriority.HIGHEST) public void onEntityTarget(final EntityTargetEvent event) { if (event.isCancelled()) @@ -314,7 +317,7 @@ public class EssentialsProtectEntityListener extends EntityListener } } - @Override + @EventHandler(priority = EventPriority.HIGHEST) public void onExplosionPrime(ExplosionPrimeEvent event) { if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball) @@ -324,7 +327,7 @@ public class EssentialsProtectEntityListener extends EntityListener } } - @Override + @EventHandler(priority = EventPriority.HIGHEST) public void onEndermanPickup(EndermanPickupEvent event) { if (event.isCancelled()) -- cgit v1.2.3