From 5eebb50cf2659484eb86198bdbc358468da1a735 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Mon, 21 Nov 2016 22:24:19 -0800 Subject: [PATCH] Relocate bad call to ProjectileHitEvent --- ...jectileHitEvent-call-to-proper-place.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 Spigot-Server-Patches/0179-Move-ProjectileHitEvent-call-to-proper-place.patch diff --git a/Spigot-Server-Patches/0179-Move-ProjectileHitEvent-call-to-proper-place.patch b/Spigot-Server-Patches/0179-Move-ProjectileHitEvent-call-to-proper-place.patch new file mode 100644 index 000000000..eea928b19 --- /dev/null +++ b/Spigot-Server-Patches/0179-Move-ProjectileHitEvent-call-to-proper-place.patch @@ -0,0 +1,30 @@ +From d53a1a9a43aed5dc7b733fceca073bf954966f27 Mon Sep 17 00:00:00 2001 +From: AlphaBlend +Date: Mon, 21 Nov 2016 22:21:53 -0800 +Subject: [PATCH] Move ProjectileHitEvent call to proper place + + +diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java +index 395f30b..9f631d1 100644 +--- a/src/main/java/net/minecraft/server/EntityFishingHook.java ++++ b/src/main/java/net/minecraft/server/EntityFishingHook.java +@@ -234,7 +234,7 @@ public class EntityFishingHook extends Entity { + // Paper end + + if (movingobjectposition != null) { +- org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, movingobjectposition.entity); // Craftbukkit - Call event // Paper - Include entity in movingobjectposition ++ //org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, movingobjectposition.entity); // Craftbukkit - Call event // Paper - Wrong location, moved down to proper location + vec3d1 = new Vec3D(movingobjectposition.pos.x, movingobjectposition.pos.y, movingobjectposition.pos.z); + } + +@@ -267,6 +267,7 @@ public class EntityFishingHook extends Entity { + + if (movingobjectposition != null && movingobjectposition.type != MovingObjectPosition.EnumMovingObjectType.MISS) { + if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.ENTITY) { ++ org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, movingobjectposition.entity); // Craftbukkit - Call event // Paper - Include entity in movingobjectposition + this.hooked = movingobjectposition.entity; + this.s(); + } else { +-- +2.10.0.windows.1 +