diff options
author | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-03-22 20:39:39 +0000 |
---|---|---|
committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-03-22 20:39:39 +0000 |
commit | 9d09e7d0167326d4169f734e4b6d04c54d767507 (patch) | |
tree | 898333912891b9c35a63994242fbd55d5b6ac2c6 /src/main/java/net/minecraft/server/BlockTNT.java | |
parent | 8dc7417a3d5c1af1e6434dc54952cfd5a8e90688 (diff) | |
download | craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar.gz craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar.lz craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar.xz craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.zip |
Updated to Minecraft version 1.2.4. Updated version string to 1.2.4-R0.1.
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockTNT.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockTNT.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java index e8261b55..96afed97 100644 --- a/src/main/java/net/minecraft/server/BlockTNT.java +++ b/src/main/java/net/minecraft/server/BlockTNT.java @@ -33,10 +33,12 @@ public class BlockTNT extends Block { } public void wasExploded(World world, int i, int j, int k) { - EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, (double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F)); + if (!world.isStatic) { + EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, (double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F)); - entitytntprimed.fuseTicks = world.random.nextInt(entitytntprimed.fuseTicks / 4) + entitytntprimed.fuseTicks / 8; - world.addEntity(entitytntprimed); + entitytntprimed.fuseTicks = world.random.nextInt(entitytntprimed.fuseTicks / 4) + entitytntprimed.fuseTicks / 8; + world.addEntity(entitytntprimed); + } } public void postBreak(World world, int i, int j, int k, int l) { @@ -63,7 +65,7 @@ public class BlockTNT extends Block { // CraftBukkit end public void attack(World world, int i, int j, int k, EntityHuman entityhuman) { - if (entityhuman.T() != null && entityhuman.T().id == Item.FLINT_AND_STEEL.id) { + if (entityhuman.U() != null && entityhuman.U().id == Item.FLINT_AND_STEEL.id) { world.setRawData(i, j, k, 1); } |