diff options
| author | Nate Mortensen <nate.richard.mortensen@gmail.com> | 2013-07-01 06:03:00 -0500 |
|---|---|---|
| committer | Wesley Wolfe <weswolf@aol.com> | 2013-07-01 12:10:06 -0500 |
| commit | 6c09066e224ac85b8a6464eaf8f53edfeb4beda4 (patch) | |
| tree | 573e05f4b148cb1891a1d3839175e501e6257442 /src/main/java/net/minecraft/server/EntityFishingHook.java | |
| parent | f887b76a259e12468b28d82d1eced93f0b73bd6d (diff) | |
| download | craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.gz craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.lz craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.xz craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.zip | |
Update CraftBukkit to 1.6.1
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityFishingHook.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityFishingHook.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java index fbae2934..255ff381 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -13,14 +13,14 @@ public class EntityFishingHook extends Entity { private int d = -1; private int e = -1; private int f = -1; - private int g = 0; - private boolean h = false; - public int a = 0; + private int g; + private boolean h; + public int a; public EntityHuman owner; private int i; - private int j = 0; - private int au = 0; - public Entity hooked = null; + private int j; + private int au; + public Entity hooked; private int av; private double aw; private double ax; @@ -93,7 +93,7 @@ public class EntityFishingHook extends Entity { this.b(this.yaw, this.pitch); } else { if (!this.world.isStatic) { - ItemStack itemstack = this.owner.cd(); + ItemStack itemstack = this.owner.bt(); if (this.owner.dead || !this.owner.isAlive() || itemstack == null || itemstack.getItem() != Item.FISHING_ROD || this.e(this.owner) > 1024.0D) { this.die(); @@ -180,7 +180,7 @@ public class EntityFishingHook extends Entity { if (movingobjectposition != null) { org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this); // Craftbukkit - Call event if (movingobjectposition.entity != null) { - if (movingobjectposition.entity.damageEntity(DamageSource.projectile(this, this.owner), 0)) { + if (movingobjectposition.entity.damageEntity(DamageSource.projectile(this, this.owner), 0.0F)) { this.hooked = movingobjectposition.entity; } } else { |