diff options
author | Erik Broes <erikbroes@ripe.net> | 2011-01-11 09:25:13 +0100 |
---|---|---|
committer | Erik Broes <erikbroes@ripe.net> | 2011-01-11 09:27:35 +0100 |
commit | 22dab8e9855b1d2aabb1ba10b16ebd5ae5943da4 (patch) | |
tree | 879d89e9f5d260f70a8199c42c1b0320b423fe17 /src/main/java/net/minecraft/server/BlockLeaves.java | |
parent | 75654e8db5b97497f6285266a1116a536d80720c (diff) | |
download | craftbukkit-22dab8e9855b1d2aabb1ba10b16ebd5ae5943da4.tar craftbukkit-22dab8e9855b1d2aabb1ba10b16ebd5ae5943da4.tar.gz craftbukkit-22dab8e9855b1d2aabb1ba10b16ebd5ae5943da4.tar.lz craftbukkit-22dab8e9855b1d2aabb1ba10b16ebd5ae5943da4.tar.xz craftbukkit-22dab8e9855b1d2aabb1ba10b16ebd5ae5943da4.zip |
Updated against new mc-dev format, takes out quite some casting troubles at the cost of extra ()'s
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockLeaves.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockLeaves.java | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/src/main/java/net/minecraft/server/BlockLeaves.java b/src/main/java/net/minecraft/server/BlockLeaves.java index 24d64514..efbf2a10 100644 --- a/src/main/java/net/minecraft/server/BlockLeaves.java +++ b/src/main/java/net/minecraft/server/BlockLeaves.java @@ -1,12 +1,13 @@ package net.minecraft.server; - import java.util.Random; + +// CraftBukkit start import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.event.Event.Type; import org.bukkit.event.block.LeavesDecayEvent; - +// CraftBukkit end public class BlockLeaves extends BlockLeavesBase { @@ -33,11 +34,8 @@ public class BlockLeaves extends BlockLeavesBase { world.c(i + j1, j + k1, k + l1, 7); } } - } - } - } } @@ -71,9 +69,7 @@ public class BlockLeaves extends BlockLeavesBase { b[(k1 + j1) * i1 + (j2 + j1) * byte1 + (l2 + j1)] = -1; } } - } - } for (int l1 = 1; l1 <= 4; l1++) { @@ -102,13 +98,9 @@ public class BlockLeaves extends BlockLeavesBase { b[(k2 + j1) * i1 + (i3 + j1) * byte1 + (k3 + j1 + 1)] = l1; } } - } - } - } - } int i2 = b[j1 * i1 + j1 * byte1 + j1]; @@ -121,16 +113,14 @@ public class BlockLeaves extends BlockLeavesBase { } private void g(World world, int i, int j, int k) { - // Craftbukkit start - CraftServer server = ((WorldServer)world).getServer(); - CraftWorld cworld = ((WorldServer)world).getWorld(); + // CraftBukkit start + CraftServer server = ((WorldServer) world).getServer(); + CraftWorld cworld = ((WorldServer) world).getWorld(); LeavesDecayEvent event = new LeavesDecayEvent(Type.LEAVES_DECAY, cworld.getBlockAt(i, j, k)); server.getPluginManager().callEvent(event); - - if (event.isCancelled()) { - return; - } - // Craftbukkit end + + if (event.isCancelled()) return; + // CraftBukkit end a_(world, i, j, k, world.b(i, j, k)); world.d(i, j, k, 0); @@ -152,4 +142,3 @@ public class BlockLeaves extends BlockLeavesBase { super.b(world, i, j, k, entity); } } - |