Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-24 03:25:15 +01:00
Code Issues Projects Releases Wiki Activity

Made iron golems fire CreatureSpawn event. Fixes BUKKIT-1089

Browse Source
This commit is contained in:
EvilSeph 2012-03-08 21:57:46 -05:00
parent f5ce8627c6
commit ecb00bba85
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/minecraft/server/BlockPumpkin.java
View File

@ -1,6 +1,9 @@
package net.minecraft.server; 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 { public class BlockPumpkin extends BlockDirectional {
@ -44,7 +47,7 @@ public class BlockPumpkin extends BlockDirectional {
EntitySnowman entitysnowman = new EntitySnowman(world); EntitySnowman entitysnowman = new EntitySnowman(world);
entitysnowman.setPositionRotation((double) i + 0.5D, (double) j - 1.95D, (double) k + 0.5D, 0.0F, 0.0F); 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, k, 0);
world.update(i, j - 1, k, 0); world.update(i, j - 1, k, 0);
world.update(i, j - 2, k, 0); world.update(i, j - 2, k, 0);
@ -73,7 +76,7 @@ public class BlockPumpkin extends BlockDirectional {
entityirongolem.b(true); entityirongolem.b(true);
entityirongolem.setPositionRotation((double) i + 0.5D, (double) j - 1.95D, (double) k + 0.5D, 0.0F, 0.0F); 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) { 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); 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);

2
src/main/java/net/minecraft/server/Village.java
View File

@ -42,7 +42,7 @@ public class Village {
EntityIronGolem entityirongolem = new EntityIronGolem(this.world); EntityIronGolem entityirongolem = new EntityIronGolem(this.world);
entityirongolem.setPosition(vec3d.a, vec3d.b, vec3d.c); 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; ++this.j;
} }
} }