summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/BlockDeadBush.java
diff options
context:
space:
mode:
authorfeildmaster <admin@feildmaster.com>2012-03-25 18:06:43 -0500
committerWarren Loo <evilseph@gmail.com>2012-03-25 19:46:55 -0400
commit80db22b643ca55f116474b3285a07d447ab188ee (patch)
tree9d14c2c7b913c7bd7506e17c262942e5153c25b7 /src/main/java/net/minecraft/server/BlockDeadBush.java
parentc30e339af6dd7594cca7e0c1ca31f0ea34a0afa9 (diff)
downloadcraftbukkit-80db22b643ca55f116474b3285a07d447ab188ee.tar
craftbukkit-80db22b643ca55f116474b3285a07d447ab188ee.tar.gz
craftbukkit-80db22b643ca55f116474b3285a07d447ab188ee.tar.lz
craftbukkit-80db22b643ca55f116474b3285a07d447ab188ee.tar.xz
craftbukkit-80db22b643ca55f116474b3285a07d447ab188ee.zip
Refactor code to be more efficient.
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockDeadBush.java')
-rw-r--r--src/main/java/net/minecraft/server/BlockDeadBush.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/BlockDeadBush.java b/src/main/java/net/minecraft/server/BlockDeadBush.java
index 60f53b88..fdb4573f 100644
--- a/src/main/java/net/minecraft/server/BlockDeadBush.java
+++ b/src/main/java/net/minecraft/server/BlockDeadBush.java
@@ -1,6 +1,5 @@
package net.minecraft.server;
-import java.util.ArrayList; // CraftBukkit
import java.util.Random;
public class BlockDeadBush extends BlockFlower {
@@ -38,13 +37,13 @@ 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) {
+ public java.util.ArrayList<ItemStack> calculateDrops(World world, EntityHuman entityhuman, int i, int j, int k, int l) {
if (!world.isStatic && entityhuman.U() != null && entityhuman.U().id == Item.SHEARS.id) {
this.a(world, i, j, k, new ItemStack(Block.DEAD_BUSH, 1, l));
- return this.dropList;
} else {
return super.calculateDrops(world, entityhuman, i, j, k, l);
}
+ return this.dropList;
}
// CraftBukkit end
}