aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0485-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0485-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch')
-rw-r--r--patches/server/0485-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/patches/server/0485-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0485-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
new file mode 100644
index 0000000000..bb6de57d99
--- /dev/null
+++ b/patches/server/0485-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 b5a46c2c8e7e139a1b5cdad69459a37d4448efb1..a81d6a52674ddf7f818a7665cccd21dd8ea86cbe 100644
+--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
++++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
+@@ -92,7 +92,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
+ }