Use instanceof ItemFishingRod instead of item equality (#4060)

This commit is contained in:
KingLemming 2017-06-24 04:26:36 -04:00 committed by mezz
parent 1b5da5d4fe
commit c0188d3228
2 changed files with 22 additions and 0 deletions

View File

@ -0,0 +1,11 @@
--- ../src-base/minecraft/net/minecraft/client/renderer/entity/RenderFish.java
+++ ../src-work/minecraft/net/minecraft/client/renderer/entity/RenderFish.java
@@ -75,7 +75,7 @@
int k = entityplayer.func_184591_cq() == EnumHandSide.RIGHT ? 1 : -1;
ItemStack itemstack = entityplayer.func_184614_ca();
- if (itemstack.func_77973_b() != Items.field_151112_aM)
+ if (!(itemstack.func_77973_b() instanceof net.minecraft.item.ItemFishingRod))
{
k = -k;
}

View File

@ -1,5 +1,16 @@
--- ../src-base/minecraft/net/minecraft/entity/projectile/EntityFishHook.java
+++ ../src-work/minecraft/net/minecraft/entity/projectile/EntityFishHook.java
@@ -269,8 +269,8 @@
{
ItemStack itemstack = this.field_146042_b.func_184614_ca();
ItemStack itemstack1 = this.field_146042_b.func_184592_cb();
- boolean flag = itemstack.func_77973_b() == Items.field_151112_aM;
- boolean flag1 = itemstack1.func_77973_b() == Items.field_151112_aM;
+ boolean flag = itemstack.func_77973_b() instanceof net.minecraft.item.ItemFishingRod;
+ boolean flag1 = itemstack1.func_77973_b() instanceof net.minecraft.item.ItemFishingRod;
if (!this.field_146042_b.field_70128_L && this.field_146042_b.func_70089_S() && (flag || flag1) && this.func_70068_e(this.field_146042_b) <= 1024.0D)
{
@@ -506,6 +506,7 @@
{
int i = 0;