diff --git a/Spigot-Server-Patches/Respect-ProjectileHitEvent-cancel-where-missing.patch b/Spigot-Server-Patches/Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 72% rename from Spigot-Server-Patches/Respect-ProjectileHitEvent-cancel-where-missing.patch rename to Spigot-Server-Patches/Remove-ProjectileHitEvent-call-when-fireballs-dead.patch index 8c136b1b64..91ac1e1582 100644 --- a/Spigot-Server-Patches/Respect-ProjectileHitEvent-cancel-where-missing.patch +++ b/Spigot-Server-Patches/Remove-ProjectileHitEvent-call-when-fireballs-dead.patch @@ -1,9 +1,10 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 16 Jan 2021 14:30:12 -0500 -Subject: [PATCH] Respect ProjectileHitEvent cancel where missing +Subject: [PATCH] Remove ProjectileHitEvent call when fireballs dead -The duplicate ProjectileHitEvent in EntityFireball was not cancelled +The duplicate ProjectileHitEvent in EntityFireball was removed. The +event was always called before the duplicate call. diff --git a/src/main/java/net/minecraft/world/entity/projectile/EntityFireball.java b/src/main/java/net/minecraft/world/entity/projectile/EntityFireball.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 @@ -14,7 +15,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 // CraftBukkit start - Fire ProjectileHitEvent if (this.dead) { - CraftEventFactory.callProjectileHitEvent(this, movingobjectposition); -+ if (CraftEventFactory.callProjectileHitEvent(this, movingobjectposition).isCancelled()) return; // Paper - this is an undesired duplicate event, but make cancellable ++ // CraftEventFactory.callProjectileHitEvent(this, movingobjectposition); // Paper - this is an undesired duplicate event } // CraftBukkit end }