summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/BlockCocoa.java
diff options
context:
space:
mode:
authorNate Mortensen <nate.richard.mortensen@gmail.com>2013-07-01 06:03:00 -0500
committerWesley Wolfe <weswolf@aol.com>2013-07-01 12:10:06 -0500
commit6c09066e224ac85b8a6464eaf8f53edfeb4beda4 (patch)
tree573e05f4b148cb1891a1d3839175e501e6257442 /src/main/java/net/minecraft/server/BlockCocoa.java
parentf887b76a259e12468b28d82d1eced93f0b73bd6d (diff)
downloadcraftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar
craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.gz
craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.lz
craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.xz
craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.zip
Update CraftBukkit to 1.6.1
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockCocoa.java')
-rw-r--r--src/main/java/net/minecraft/server/BlockCocoa.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/BlockCocoa.java b/src/main/java/net/minecraft/server/BlockCocoa.java
index b7007d94..2ed2bdab 100644
--- a/src/main/java/net/minecraft/server/BlockCocoa.java
+++ b/src/main/java/net/minecraft/server/BlockCocoa.java
@@ -14,7 +14,7 @@ public class BlockCocoa extends BlockDirectional {
public void a(World world, int i, int j, int k, Random random) {
if (!this.f(world, i, j, k)) {
this.c(world, i, j, k, world.getData(i, j, k), 0);
- world.setAir(i, j, k);
+ world.setTypeIdAndData(i, j, k, 0, 0, 2);
} else if (world.random.nextInt(5) == 0) {
int l = world.getData(i, j, k);
int i1 = c(l);
@@ -33,7 +33,7 @@ public class BlockCocoa extends BlockDirectional {
k += Direction.b[l];
int i1 = world.getTypeId(i, j, k);
- return i1 == Block.LOG.id && BlockLog.d(world.getData(i, j, k)) == 3;
+ return i1 == Block.LOG.id && BlockLog.f(world.getData(i, j, k)) == 3;
}
public int d() {
@@ -96,7 +96,7 @@ public class BlockCocoa extends BlockDirectional {
public void doPhysics(World world, int i, int j, int k, int l) {
if (!this.f(world, i, j, k)) {
this.c(world, i, j, k, world.getData(i, j, k), 0);
- world.setAir(i, j, k);
+ world.setTypeIdAndData(i, j, k, 0, 0, 2);
}
}