From 7fbefda8486ab1017485d009b64b4081139b9d0a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 10 Jan 2017 09:35:58 -0600 Subject: [PATCH] Fix inconsistencies in life imbuer vs vanilla mob spawner. closes #2040 --- .../java/vazkii/botania/common/block/tile/TileSpawnerClaw.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java index 5de9611c7..3a6912c61 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -104,10 +104,11 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { EntityLiving entityliving = entity instanceof EntityLiving ? (EntityLiving)entity : null; entity.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, world.rand.nextFloat() * 360.0F, 0.0F); - if (entityliving == null || entityliving.getCanSpawnHere()) + if (entityliving == null || net.minecraftforge.event.ForgeEventFactory.canEntitySpawnSpawner(entityliving, logic.getSpawnerWorld(), (float)entity.posX, (float)entity.posY, (float)entity.posZ)) { if (randomEntity.getNbt().getSize() == 1 && randomEntity.getNbt().hasKey("id", 8) && entity instanceof EntityLiving) { + if (!net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(entityliving, logic.getSpawnerWorld(), (float)entity.posX, (float)entity.posY, (float)entity.posZ)) ((EntityLiving)entity).onInitialSpawn(world.getDifficultyForLocation(new BlockPos(entity)), null); }