diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2014-06-26 13:05:08 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2014-07-08 14:31:10 -0500 |
commit | dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00 (patch) | |
tree | 062b1b273d0e0f337fde6b79f9377519d85c48c5 /src/main/java/net/minecraft/server/EntityFishingHook.java | |
parent | a8628fd645e12ec22bc525f49dd25f68d094f3ef (diff) | |
download | craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.gz craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.lz craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.xz craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.zip |
Update CraftBukkit to Minecraft 1.7.10
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityFishingHook.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityFishingHook.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java index 2a73b6c4..2ee3f301 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -101,7 +101,7 @@ public class EntityFishingHook extends Entity { this.b(this.yaw, this.pitch); } else { if (!this.world.isStatic) { - ItemStack itemstack = this.owner.bE(); + ItemStack itemstack = this.owner.bF(); if (this.owner.dead || !this.owner.isAlive() || itemstack == null || itemstack.getItem() != Items.FISHING_ROD || this.f(this.owner) > 1024.0D) { this.die(); @@ -164,7 +164,7 @@ public class EntityFishingHook extends Entity { for (int i = 0; i < list.size(); ++i) { Entity entity1 = (Entity) list.get(i); - if (entity1.Q() && (entity1 != this.owner || this.aw >= 5)) { + if (entity1.R() && (entity1 != this.owner || this.aw >= 5)) { float f = 0.3F; AxisAlignedBB axisalignedbb = entity1.boundingBox.grow((double) f, (double) f, (double) f); MovingObjectPosition movingobjectposition1 = axisalignedbb.a(vec3d, vec3d1); @@ -344,7 +344,7 @@ public class EntityFishingHook extends Entity { nbttagcompound.setShort("xTile", (short) this.g); nbttagcompound.setShort("yTile", (short) this.h); nbttagcompound.setShort("zTile", (short) this.i); - nbttagcompound.setByte("inTile", (byte) Block.b(this.at)); + nbttagcompound.setByte("inTile", (byte) Block.getId(this.at)); nbttagcompound.setByte("shake", (byte) this.a); nbttagcompound.setByte("inGround", (byte) (this.au ? 1 : 0)); } @@ -353,7 +353,7 @@ public class EntityFishingHook extends Entity { this.g = nbttagcompound.getShort("xTile"); this.h = nbttagcompound.getShort("yTile"); this.i = nbttagcompound.getShort("zTile"); - this.at = Block.e(nbttagcompound.getByte("inTile") & 255); + this.at = Block.getById(nbttagcompound.getByte("inTile") & 255); this.a = nbttagcompound.getByte("shake") & 255; this.au = nbttagcompound.getByte("inGround") == 1; } |