diff options
| author | ementalo <ementalodev@gmx.co.uk> | 2012-07-06 15:57:54 +0100 |
|---|---|---|
| committer | ementalo <ementalodev@gmx.co.uk> | 2012-07-06 15:57:54 +0100 |
| commit | 06e6749ca3851b0ec6a1d0ab5f64d61e95d0be69 (patch) | |
| tree | 717ebae95c7a0fe87b304d9ad594bfc2d0de0112 /EssentialsProtect/src | |
| parent | 30600295a62616dc4ef8321b420cebca6298eaa5 (diff) | |
| download | Essentials-06e6749ca3851b0ec6a1d0ab5f64d61e95d0be69.tar Essentials-06e6749ca3851b0ec6a1d0ab5f64d61e95d0be69.tar.gz Essentials-06e6749ca3851b0ec6a1d0ab5f64d61e95d0be69.tar.lz Essentials-06e6749ca3851b0ec6a1d0ab5f64d61e95d0be69.tar.xz Essentials-06e6749ca3851b0ec6a1d0ab5f64d61e95d0be69.zip | |
Move creature spawn prevention to core
Diffstat (limited to 'EssentialsProtect/src')
| -rw-r--r-- | EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java index 67df5c8c5..462205a09 100644 --- a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java +++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java @@ -1,5 +1,6 @@ package net.ess3.protect; +import net.ess3.api.ISettings; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; @@ -236,33 +237,7 @@ public class EssentialsProtectEntityListener implements Listener } } - @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) - public void onCreatureSpawn(final CreatureSpawnEvent event) - { - if (event.getEntity().getType() == EntityType.PLAYER) - { - return; - } - final EntityType creature = event.getEntityType(); - if (creature == null) - { - return; - } - final ProtectHolder settings = prot.getSettings(); - settings.acquireReadLock(); - try - { - final Boolean prevent = settings.getData().getPrevent().getSpawn().get(creature); - if (prevent != null && prevent) - { - event.setCancelled(true); - } - } - finally - { - settings.unlock(); - } - } + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onEntityTarget(final EntityTargetEvent event) |