diff options
author | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-03-01 10:49:23 +0000 |
---|---|---|
committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-03-01 14:38:31 +0000 |
commit | 543c4879fee3b7165764c5371d226c93fe3a657b (patch) | |
tree | 4fe9116464e1fe42a40dc3ba19b58234bd26f821 /src/main/java/net/minecraft/server/BlockPumpkin.java | |
parent | e9ca87000c1794715bc3fe0a7d1caaf809057635 (diff) | |
download | craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar.gz craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar.lz craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar.xz craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.zip |
Updated CraftBukkit to 1.2
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockPumpkin.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockPumpkin.java | 48 |
1 files changed, 44 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/BlockPumpkin.java b/src/main/java/net/minecraft/server/BlockPumpkin.java index a702c5e4..dcc86931 100644 --- a/src/main/java/net/minecraft/server/BlockPumpkin.java +++ b/src/main/java/net/minecraft/server/BlockPumpkin.java @@ -2,7 +2,7 @@ package net.minecraft.server; import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit -public class BlockPumpkin extends Block { +public class BlockPumpkin extends BlockDirectional { private boolean a; @@ -38,18 +38,58 @@ public class BlockPumpkin extends Block { if (world.suppressPhysics) return; // CraftBukkit if (world.getTypeId(i, j - 1, k) == Block.SNOW_BLOCK.id && world.getTypeId(i, j - 2, k) == Block.SNOW_BLOCK.id) { if (!world.isStatic && world.getServer().getServer().spawnAnimals) { // CraftBukkit - make snowmen obey spawning rules - world.setTypeId(i, j, k, 0); - world.setTypeId(i, j - 1, k, 0); - world.setTypeId(i, j - 2, k, 0); + world.setRawTypeId(i, j, k, 0); + world.setRawTypeId(i, j - 1, k, 0); + world.setRawTypeId(i, j - 2, k, 0); 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.update(i, j, k, 0); + world.update(i, j - 1, k, 0); + world.update(i, j - 2, k, 0); } for (int l = 0; l < 120; ++l) { world.a("snowshovel", (double) i + world.random.nextDouble(), (double) (j - 2) + world.random.nextDouble() * 2.5D, (double) k + world.random.nextDouble(), 0.0D, 0.0D, 0.0D); } + } else if (world.getTypeId(i, j - 1, k) == Block.IRON_BLOCK.id && world.getTypeId(i, j - 2, k) == Block.IRON_BLOCK.id) { + boolean flag = world.getTypeId(i - 1, j - 1, k) == Block.IRON_BLOCK.id && world.getTypeId(i + 1, j - 1, k) == Block.IRON_BLOCK.id; + boolean flag1 = world.getTypeId(i, j - 1, k - 1) == Block.IRON_BLOCK.id && world.getTypeId(i, j - 1, k + 1) == Block.IRON_BLOCK.id; + + if (flag || flag1) { + world.setRawTypeId(i, j, k, 0); + world.setRawTypeId(i, j - 1, k, 0); + world.setRawTypeId(i, j - 2, k, 0); + if (flag) { + world.setRawTypeId(i - 1, j - 1, k, 0); + world.setRawTypeId(i + 1, j - 1, k, 0); + } else { + world.setRawTypeId(i, j - 1, k - 1, 0); + world.setRawTypeId(i, j - 1, k + 1, 0); + } + + EntityIronGolem entityirongolem = new EntityIronGolem(world); + + entityirongolem.b(true); + entityirongolem.setPositionRotation((double) i + 0.5D, (double) j - 1.95D, (double) k + 0.5D, 0.0F, 0.0F); + world.addEntity(entityirongolem); + + 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.update(i, j, k, 0); + world.update(i, j - 1, k, 0); + world.update(i, j - 2, k, 0); + if (flag) { + world.update(i - 1, j - 1, k, 0); + world.update(i + 1, j - 1, k, 0); + } else { + world.update(i, j - 1, k - 1, 0); + world.update(i, j - 1, k + 1, 0); + } + } } } |