mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed duplicate ProjectileHitEvent for fireball (#5671)

Browse source
This commit is contained in:
Jake Potrebic 2021-05-18 08:54:12 -07:00 committed by GitHub
parent 7989028a53
commit d3c9a195cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Spigot-Server-Patches/0649-Respect-ProjectileHitEvent-cancel-where-missing.patch → Spigot-Server-Patches/0649-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
View file

@ -1,12 +1,13 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 16 Jan 2021 14:30:12 -0500 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 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 9660dc2263c48a5818b767843658eeb9ee1748ea..243b24e7c304b379aeb925fe1e2435853f80397d 100644 index 9660dc2263c48a5818b767843658eeb9ee1748ea..ba3b52691db79c83d4482664b7a9615ab9be2761 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/EntityFireball.java --- a/src/main/java/net/minecraft/world/entity/projectile/EntityFireball.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/EntityFireball.java +++ b/src/main/java/net/minecraft/world/entity/projectile/EntityFireball.java
@@ -87,7 +87,7 @@ public abstract class EntityFireball extends IProjectile { @@ -87,7 +87,7 @@ public abstract class EntityFireball extends IProjectile {
@ -14,7 +15,7 @@ index 9660dc2263c48a5818b767843658eeb9ee1748ea..243b24e7c304b379aeb925fe1e243585
// CraftBukkit start - Fire ProjectileHitEvent // CraftBukkit start - Fire ProjectileHitEvent
if (this.dead) { if (this.dead) {
- CraftEventFactory.callProjectileHitEvent(this, movingobjectposition); - 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 // CraftBukkit end
} }