From 591cfb5857246fa9f7101f2d802ad6aff985c732 Mon Sep 17 00:00:00 2001 From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com> Date: Sat, 5 Oct 2019 23:13:48 +0100 Subject: [PATCH] Check we're dealing with the type of mob whose class we're in, fixes #274 --- .../electroblob/wizardry/entity/living/EntityEvilWizard.java | 2 +- .../electroblob/wizardry/entity/living/EntityIceWraith.java | 2 +- .../wizardry/entity/living/EntityLightningWraith.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/electroblob/wizardry/entity/living/EntityEvilWizard.java b/src/main/java/electroblob/wizardry/entity/living/EntityEvilWizard.java index e48b3428..5f2fa9d6 100644 --- a/src/main/java/electroblob/wizardry/entity/living/EntityEvilWizard.java +++ b/src/main/java/electroblob/wizardry/entity/living/EntityEvilWizard.java @@ -392,7 +392,7 @@ public class EntityEvilWizard extends EntityMob implements ISpellCaster, IEntity @SubscribeEvent public static void onCheckSpawnEvent(LivingSpawnEvent.CheckSpawn event){ // We have no way of checking if it's a spawner in getCanSpawnHere() so this has to be done here instead - if(!event.isSpawner()){ + if(event.getEntityLiving() instanceof EntityEvilWizard && !event.isSpawner()){ if(!ArrayUtils.contains(Wizardry.settings.mobSpawnDimensions, event.getWorld().provider.getDimension())) event.setResult(Event.Result.DENY); } diff --git a/src/main/java/electroblob/wizardry/entity/living/EntityIceWraith.java b/src/main/java/electroblob/wizardry/entity/living/EntityIceWraith.java index 5bbb8cd0..8e4e55b4 100644 --- a/src/main/java/electroblob/wizardry/entity/living/EntityIceWraith.java +++ b/src/main/java/electroblob/wizardry/entity/living/EntityIceWraith.java @@ -197,7 +197,7 @@ public class EntityIceWraith extends EntityBlazeMinion { @SubscribeEvent public static void onCheckSpawnEvent(LivingSpawnEvent.CheckSpawn event){ // We have no way of checking if it's a spawner in getCanSpawnHere() so this has to be done here instead - if(!event.isSpawner()){ + if(event.getEntityLiving() instanceof EntityLightningWraith && !event.isSpawner()){ if(!ArrayUtils.contains(Wizardry.settings.mobSpawnDimensions, event.getWorld().provider.getDimension())) event.setResult(Event.Result.DENY); } diff --git a/src/main/java/electroblob/wizardry/entity/living/EntityLightningWraith.java b/src/main/java/electroblob/wizardry/entity/living/EntityLightningWraith.java index 7e54a550..d45f656c 100644 --- a/src/main/java/electroblob/wizardry/entity/living/EntityLightningWraith.java +++ b/src/main/java/electroblob/wizardry/entity/living/EntityLightningWraith.java @@ -89,7 +89,7 @@ public class EntityLightningWraith extends EntityBlazeMinion { @SubscribeEvent public static void onCheckSpawnEvent(LivingSpawnEvent.CheckSpawn event){ // We have no way of checking if it's a spawner in getCanSpawnHere() so this has to be done here instead - if(!event.isSpawner()){ + if(event.getEntityLiving() instanceof EntityLightningWraith && !event.isSpawner()){ if(!event.getWorld().isThundering()) event.setResult(Event.Result.DENY); if(!ArrayUtils.contains(Wizardry.settings.mobSpawnDimensions, event.getWorld().provider.getDimension())) event.setResult(Event.Result.DENY);