summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/BlockCactus.java
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-06-29 23:02:25 +0100
committerDinnerbone <dinnerbone@dinnerbone.com>2011-06-30 15:19:25 +0100
commita679e7f38025924dba3dd688ccb87e92306c4c3e (patch)
tree604a20c893873bef01a92eaa09d9309f32b7e29c /src/main/java/net/minecraft/server/BlockCactus.java
parenta98c7ba2c706caa0ba83bddefa5ffecbe658ccd3 (diff)
downloadcraftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.tar
craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.tar.gz
craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.tar.lz
craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.tar.xz
craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.zip
Update to Minecraft 1.7
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockCactus.java')
-rw-r--r--src/main/java/net/minecraft/server/BlockCactus.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
index 90596299..d1800e63 100644
--- a/src/main/java/net/minecraft/server/BlockCactus.java
+++ b/src/main/java/net/minecraft/server/BlockCactus.java
@@ -35,7 +35,7 @@ public class BlockCactus extends Block {
}
}
- public AxisAlignedBB d(World world, int i, int j, int k) {
+ public AxisAlignedBB e(World world, int i, int j, int k) {
float f = 0.0625F;
return AxisAlignedBB.b((double) ((float) i + f), (double) j, (double) ((float) k + f), (double) ((float) (i + 1) - f), (double) ((float) (j + 1) - f), (double) ((float) (k + 1) - f));
@@ -59,7 +59,7 @@ public class BlockCactus extends Block {
public void doPhysics(World world, int i, int j, int k, int l) {
if (!this.f(world, i, j, k)) {
- this.b_(world, i, j, k, world.getData(i, j, k));
+ this.g(world, i, j, k, world.getData(i, j, k));
world.setTypeId(i, j, k, 0);
}
}