From 669de4c91dd40663c7be52056bfe6a2c2e116cbe Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Wed, 26 Aug 2015 16:44:39 -0700 Subject: [PATCH] Change EntitySpawnEvent to CreatureSpawnEvent --- .../src/mineplex/game/clans/spawn/Spawn.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/Spawn.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/Spawn.java index 210acdc72..b3c83bae9 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/Spawn.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/Spawn.java @@ -15,6 +15,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockIgniteEvent; import org.bukkit.event.block.BlockIgniteEvent.IgniteCause; +import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.event.entity.EntitySpawnEvent; @@ -94,9 +95,9 @@ public class Spawn extends MiniPlugin } @EventHandler - public void onEntitySpawn(EntitySpawnEvent event) + public void onEntitySpawn(CreatureSpawnEvent event) { - if (event.getEntity() instanceof Monster && isInSpawn(event.getLocation())) + if (event.getSpawnReason() != CreatureSpawnEvent.SpawnReason.CUSTOM && isInSpawn(event.getLocation())) { event.setCancelled(true); }