From ecb00bba85d0a87b85382ff92fe09fa5741c6ea7 Mon Sep 17 00:00:00 2001 From: EvilSeph Date: Thu, 8 Mar 2012 21:57:46 -0500 Subject: [PATCH] Made iron golems fire CreatureSpawn event. Fixes BUKKIT-1089 --- src/main/java/net/minecraft/server/BlockPumpkin.java | 9 ++++++--- src/main/java/net/minecraft/server/Village.java | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/minecraft/server/BlockPumpkin.java b/src/main/java/net/minecraft/server/BlockPumpkin.java index dcc86931c2..6c34d3dab2 100644 --- a/src/main/java/net/minecraft/server/BlockPumpkin.java +++ b/src/main/java/net/minecraft/server/BlockPumpkin.java @@ -1,6 +1,9 @@ package net.minecraft.server; -import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit +// CraftBukkit start +import org.bukkit.event.block.BlockRedstoneEvent; +import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; +// CraftBukkit end public class BlockPumpkin extends BlockDirectional { @@ -44,7 +47,7 @@ public class BlockPumpkin extends BlockDirectional { EntitySnowman entitysnowman = new EntitySnowman(world); entitysnowman.setPositionRotation((double) i + 0.5D, (double) j - 1.95D, (double) k + 0.5D, 0.0F, 0.0F); - world.addEntity(entitysnowman, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BUILD_SNOWMAN); // CraftBukkit + world.addEntity(entitysnowman, SpawnReason.BUILD_SNOWMAN); // CraftBukkit world.update(i, j, k, 0); world.update(i, j - 1, k, 0); world.update(i, j - 2, k, 0); @@ -73,7 +76,7 @@ public class BlockPumpkin extends BlockDirectional { entityirongolem.b(true); entityirongolem.setPositionRotation((double) i + 0.5D, (double) j - 1.95D, (double) k + 0.5D, 0.0F, 0.0F); - world.addEntity(entityirongolem); + world.addEntity(entityirongolem, SpawnReason.BUILD_IRONGOLEM); for (int i1 = 0; i1 < 120; ++i1) { world.a("snowballpoof", (double) i + world.random.nextDouble(), (double) (j - 2) + world.random.nextDouble() * 3.9D, (double) k + world.random.nextDouble(), 0.0D, 0.0D, 0.0D); diff --git a/src/main/java/net/minecraft/server/Village.java b/src/main/java/net/minecraft/server/Village.java index a0ac3ad84b..786e17ba68 100644 --- a/src/main/java/net/minecraft/server/Village.java +++ b/src/main/java/net/minecraft/server/Village.java @@ -42,7 +42,7 @@ public class Village { EntityIronGolem entityirongolem = new EntityIronGolem(this.world); entityirongolem.setPosition(vec3d.a, vec3d.b, vec3d.c); - this.world.addEntity(entityirongolem); + this.world.addEntity(entityirongolem, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.VILLAGE_DEFENSE); // CraftBukkit ++this.j; } }