diff options
Diffstat (limited to 'patches/server/0536-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch')
-rw-r--r-- | patches/server/0536-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/patches/server/0536-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0536-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch new file mode 100644 index 0000000000..3f7c51ddfe --- /dev/null +++ b/patches/server/0536-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch @@ -0,0 +1,21 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Aikar <[email protected]> +Date: Sat, 16 Jan 2021 14:30:12 -0500 +Subject: [PATCH] Remove ProjectileHitEvent call when fireballs dead + +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/AbstractHurtingProjectile.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java +index b430d508e69de01d8271a73e0ed41865dcf012c4..6c9a8f062f989db022154155e8a05b334a0510da 100644 +--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java ++++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java +@@ -88,7 +88,7 @@ public abstract class AbstractHurtingProjectile extends Projectile { + + // CraftBukkit start - Fire ProjectileHitEvent + if (this.isRemoved()) { +- CraftEventFactory.callProjectileHitEvent(this, movingobjectposition); ++ // CraftEventFactory.callProjectileHitEvent(this, movingobjectposition); // Paper - this is an undesired duplicate event + } + // CraftBukkit end + } |