fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check we're dealing with the type of mob whose class we're in, fixes #274

Browse Source
This commit is contained in:
Electroblob77
2019-10-05 23:13:48 +01:00
parent bc2037f74e
commit 591cfb5857
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/entity/living/EntityEvilWizard.java
+1 -1
View File
@@ -392,7 +392,7 @@ public class EntityEvilWizard extends EntityMob implements ISpellCaster, IEntity
@SubscribeEvent @SubscribeEvent
public static void onCheckSpawnEvent(LivingSpawnEvent.CheckSpawn event){ 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 // 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())) if(!ArrayUtils.contains(Wizardry.settings.mobSpawnDimensions, event.getWorld().provider.getDimension()))
event.setResult(Event.Result.DENY); event.setResult(Event.Result.DENY);
} }
src/main/java/electroblob/wizardry/entity/living/EntityIceWraith.java
+1 -1
View File
@@ -197,7 +197,7 @@ public class EntityIceWraith extends EntityBlazeMinion {
@SubscribeEvent @SubscribeEvent
public static void onCheckSpawnEvent(LivingSpawnEvent.CheckSpawn event){ 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 // 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())) if(!ArrayUtils.contains(Wizardry.settings.mobSpawnDimensions, event.getWorld().provider.getDimension()))
event.setResult(Event.Result.DENY); event.setResult(Event.Result.DENY);
} }
src/main/java/electroblob/wizardry/entity/living/EntityLightningWraith.java
+1 -1
View File
@@ -89,7 +89,7 @@ public class EntityLightningWraith extends EntityBlazeMinion {
@SubscribeEvent @SubscribeEvent
public static void onCheckSpawnEvent(LivingSpawnEvent.CheckSpawn event){ 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 // 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(!event.getWorld().isThundering()) event.setResult(Event.Result.DENY);
if(!ArrayUtils.contains(Wizardry.settings.mobSpawnDimensions, event.getWorld().provider.getDimension())) if(!ArrayUtils.contains(Wizardry.settings.mobSpawnDimensions, event.getWorld().provider.getDimension()))
event.setResult(Event.Result.DENY); event.setResult(Event.Result.DENY);