diff options
author | mbax <matt@phozop.net> | 2013-11-04 07:07:38 -0600 |
---|---|---|
committer | Wesley Wolfe <weswolf@aol.com> | 2013-11-30 19:26:12 -0600 |
commit | 2726696652179a5ead7dc07dd39edf7dfda687f7 (patch) | |
tree | ff78e22fdd4fc01889a5f6cc482b599f965cd93a /src/main/java/net/minecraft/server/ItemBow.java | |
parent | ff8b70fbb7a96b9d2ff078afcf3b3ff90f200981 (diff) | |
download | craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.gz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.lz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.xz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.zip |
Update CraftBukkit to Minecraft 1.7.2
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemBow.java')
-rw-r--r-- | src/main/java/net/minecraft/server/ItemBow.java | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/main/java/net/minecraft/server/ItemBow.java b/src/main/java/net/minecraft/server/ItemBow.java index 7b0bb510..59d543ca 100644 --- a/src/main/java/net/minecraft/server/ItemBow.java +++ b/src/main/java/net/minecraft/server/ItemBow.java @@ -4,8 +4,7 @@ public class ItemBow extends Item { public static final String[] a = new String[] { "pulling_0", "pulling_1", "pulling_2"}; - public ItemBow(int i) { - super(i); + public ItemBow() { this.maxStackSize = 1; this.setMaxDurability(384); this.a(CreativeModeTab.j); @@ -14,7 +13,7 @@ public class ItemBow extends Item { public void a(ItemStack itemstack, World world, EntityHuman entityhuman, int i) { boolean flag = entityhuman.abilities.canInstantlyBuild || EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_INFINITE.id, itemstack) > 0; - if (flag || entityhuman.inventory.e(Item.ARROW.id)) { + if (flag || entityhuman.inventory.b(Items.ARROW)) { int j = this.d_(itemstack) - i; float f = (float) j / 20.0F; @@ -36,7 +35,7 @@ public class ItemBow extends Item { int k = EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_DAMAGE.id, itemstack); if (k > 0) { - entityarrow.b(entityarrow.c() + (double) k * 0.5D + 0.5D); + entityarrow.b(entityarrow.e() + (double) k * 0.5D + 0.5D); } int l = EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_KNOCKBACK.id, itemstack); @@ -62,13 +61,16 @@ public class ItemBow extends Item { // CraftBukkit end itemstack.damage(1, entityhuman); - world.makeSound(entityhuman, "random.bow", 1.0F, 1.0F / (Item.f.nextFloat() * 0.4F + 1.2F) + f * 0.5F); // CraftBukkit - Fix compilation + world.makeSound(entityhuman, "random.bow", 1.0F, 1.0F / (g.nextFloat() * 0.4F + 1.2F) + f * 0.5F); if (flag) { entityarrow.fromPlayer = 2; } else { - entityhuman.inventory.d(Item.ARROW.id); + entityhuman.inventory.a(Items.ARROW); + } + + if (!world.isStatic) { + // world.addEntity(entityarrow); // CraftBukkit - moved up } - // CraftBukkit - moved addEntity up } } @@ -80,12 +82,12 @@ public class ItemBow extends Item { return 72000; } - public EnumAnimation c_(ItemStack itemstack) { + public EnumAnimation d(ItemStack itemstack) { return EnumAnimation.BOW; } public ItemStack a(ItemStack itemstack, World world, EntityHuman entityhuman) { - if (entityhuman.abilities.canInstantlyBuild || entityhuman.inventory.e(Item.ARROW.id)) { + if (entityhuman.abilities.canInstantlyBuild || entityhuman.inventory.b(Items.ARROW)) { entityhuman.a(itemstack, this.d_(itemstack)); } |