summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/BlockDeadBush.java
diff options
context:
space:
mode:
authorNathan Adams <dinnerbone@dinnerbone.com>2012-03-22 20:39:39 +0000
committerNathan Adams <dinnerbone@dinnerbone.com>2012-03-22 20:39:39 +0000
commit9d09e7d0167326d4169f734e4b6d04c54d767507 (patch)
tree898333912891b9c35a63994242fbd55d5b6ac2c6 /src/main/java/net/minecraft/server/BlockDeadBush.java
parent8dc7417a3d5c1af1e6434dc54952cfd5a8e90688 (diff)
downloadcraftbukkit-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/BlockDeadBush.java')
-rw-r--r--src/main/java/net/minecraft/server/BlockDeadBush.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/BlockDeadBush.java b/src/main/java/net/minecraft/server/BlockDeadBush.java
index 9b0c89f8..7486f92e 100644
--- a/src/main/java/net/minecraft/server/BlockDeadBush.java
+++ b/src/main/java/net/minecraft/server/BlockDeadBush.java
@@ -25,7 +25,7 @@ public class BlockDeadBush extends BlockFlower {
}
public void a(World world, EntityHuman entityhuman, int i, int j, int k, int l) {
- if (!world.isStatic && entityhuman.T() != null && entityhuman.T().id == Item.SHEARS.id) {
+ if (!world.isStatic && entityhuman.U() != null && entityhuman.U().id == Item.SHEARS.id) {
entityhuman.a(StatisticList.C[this.id], 1);
/* CraftBukkit start - moved this line into calculateDrops
this.a(world, i, j, k, new ItemStack(Block.DEAD_BUSH, 1, l));
@@ -39,7 +39,7 @@ public class BlockDeadBush extends BlockFlower {
// CraftBukkit start - Calculate drops
public ArrayList<ItemStack> calculateDrops(World world, EntityHuman entityhuman, int i, int j, int k, int l) {
- if (!world.isStatic && entityhuman.T() != null && entityhuman.T().id == Item.SHEARS.id) {
+ if (!world.isStatic && entityhuman.U() != null && entityhuman.U().id == Item.SHEARS.id) {
super.dropList = new ArrayList<ItemStack>();
this.a(world, i, j, k, new ItemStack(Block.DEAD_BUSH, 1, l));
return super.dropList;