diff options
author | feildmaster <admin@feildmaster.com> | 2012-03-25 18:06:43 -0500 |
---|---|---|
committer | Warren Loo <evilseph@gmail.com> | 2012-03-25 19:46:55 -0400 |
commit | 80db22b643ca55f116474b3285a07d447ab188ee (patch) | |
tree | 9d14c2c7b913c7bd7506e17c262942e5153c25b7 /src/main/java/net/minecraft/server/Block.java | |
parent | c30e339af6dd7594cca7e0c1ca31f0ea34a0afa9 (diff) | |
download | craftbukkit-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/Block.java')
-rw-r--r-- | src/main/java/net/minecraft/server/Block.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java index 43430951..3244351d 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -164,7 +164,7 @@ public class Block { public final Material material; public float frictionFactor; private String name; - public ArrayList<ItemStack> dropList = new ArrayList<ItemStack>(1); // CraftBukkit + public final ArrayList<ItemStack> dropList = new ArrayList<ItemStack>(1); // CraftBukkit protected Block(int i, Material material) { this.bR = true; @@ -362,7 +362,7 @@ public class Block { protected void a(World world, int i, int j, int k, ItemStack itemstack) { // CraftBukkit start - the logic of this function is moved into finishDrop - // This is such a hackish change it's rediculous. + // This is such a hackish change it's ridiculous. this.dropList.add(itemstack); } @@ -550,6 +550,7 @@ public class Block { this.dropList.clear(); } + // Blocks that have different drops in certain situations need to override this. IE: Sheers on BlockLeaves public ArrayList<ItemStack> calculateDrops(World world, EntityHuman entityhuman, int i, int j, int k, int l) { // CraftBukkit end if (this.h() && EnchantmentManager.hasSilkTouchEnchantment(entityhuman.inventory)) { @@ -563,7 +564,8 @@ public class Block { this.dropNaturally(world, i, j, k, l, 1.0F, i1); // CraftBukkit } - return this.dropList; // CraftBukkit + + return this.dropList; } protected boolean h() { |