diff --git a/MobArena.jar b/MobArena.jar index 1d1e3a6..43e8ae2 100644 Binary files a/MobArena.jar and b/MobArena.jar differ diff --git a/src/com/garbagemule/MobArena/ArenaListener.java b/src/com/garbagemule/MobArena/ArenaListener.java index d319a20..3deb6e4 100644 --- a/src/com/garbagemule/MobArena/ArenaListener.java +++ b/src/com/garbagemule/MobArena/ArenaListener.java @@ -33,6 +33,8 @@ import org.bukkit.event.block.SignChangeEvent; import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; import org.bukkit.event.entity.EntityChangeBlockEvent; +import org.bukkit.event.entity.EntityCombustByBlockEvent; +import org.bukkit.event.entity.EntityCombustByEntityEvent; import org.bukkit.event.entity.EntityCombustEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent; @@ -521,8 +523,12 @@ public class ArenaListener } public void onEntityCombust(EntityCombustEvent event) { - if (monsters.getMonsters().contains(event.getEntity())) + if (monsters.getMonsters().contains(event.getEntity())) { + if (event instanceof EntityCombustByBlockEvent || event instanceof EntityCombustByEntityEvent) { + return; + } event.setCancelled(true); + } } public void onEntityTarget(EntityTargetEvent event) {