diff options
Diffstat (limited to 'nms-patches/EntityFishingHook.patch')
| -rw-r--r-- | nms-patches/EntityFishingHook.patch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/nms-patches/EntityFishingHook.patch b/nms-patches/EntityFishingHook.patch index 7b0fbc62..65113404 100644 --- a/nms-patches/EntityFishingHook.patch +++ b/nms-patches/EntityFishingHook.patch @@ -12,7 +12,7 @@ public class EntityFishingHook extends Entity { -@@ -251,6 +256,7 @@ +@@ -261,6 +266,7 @@ } if (movingobjectposition != null && movingobjectposition.type != MovingObjectPosition.EnumMovingObjectType.MISS) { @@ -20,7 +20,7 @@ if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.ENTITY) { this.hooked = movingobjectposition.entity; this.s(); -@@ -283,6 +289,10 @@ +@@ -293,6 +299,10 @@ if (this.g <= 0) { this.h = 0; this.at = 0; @@ -31,7 +31,7 @@ } else { this.motY -= 0.2D * (double) this.random.nextFloat() * (double) this.random.nextFloat(); } -@@ -318,6 +328,13 @@ +@@ -328,6 +338,13 @@ worldserver.a(EnumParticle.WATER_WAKE, d0, d1, d2, 0, (double) (-f4), 0.01D, (double) f3, 1.0D, new int[0]); } } else { @@ -45,7 +45,7 @@ this.motY = (double) (-0.4F * MathHelper.a(this.random, 0.6F, 1.0F)); this.a(SoundEffects.H, 0.25F, 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.4F); double d3 = this.getBoundingBox().b + 0.5D; -@@ -374,6 +391,14 @@ +@@ -384,6 +401,14 @@ int i = 0; if (this.hooked != null) { @@ -60,7 +60,7 @@ this.k(); this.world.broadcastEntityEffect(this, (byte) 31); i = this.hooked instanceof EntityItem ? 3 : 5; -@@ -386,6 +411,15 @@ +@@ -396,6 +421,15 @@ while (iterator.hasNext()) { ItemStack itemstack = (ItemStack) iterator.next(); EntityItem entityitem = new EntityItem(this.world, this.locX, this.locY, this.locZ, itemstack); @@ -76,7 +76,7 @@ double d0 = this.owner.locX - this.locX; double d1 = this.owner.locY - this.locY; double d2 = this.owner.locZ - this.locZ; -@@ -396,15 +430,36 @@ +@@ -406,7 +440,11 @@ entityitem.motY = d1 * 0.1D + (double) MathHelper.sqrt(d3) * 0.08D; entityitem.motZ = d2 * 0.1D; this.world.addEntity(entityitem); @@ -86,9 +86,10 @@ + this.owner.world.addEntity(new EntityExperienceOrb(this.owner.world, this.owner.locX, this.owner.locY + 0.5D, this.owner.locZ + 0.5D, playerFishEvent.getExpToDrop())); + } + // CraftBukkit end - } + Item item = itemstack.getItem(); - i = 1; + if (item == Items.FISH || item == Items.COOKED_FISH) { +@@ -418,8 +456,25 @@ } if (this.isInGround) { |