diff options
Diffstat (limited to 'nms-patches/EntityFireworks.patch')
| -rw-r--r-- | nms-patches/EntityFireworks.patch | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/nms-patches/EntityFireworks.patch b/nms-patches/EntityFireworks.patch index 8a06d7bb..9575d172 100644 --- a/nms-patches/EntityFireworks.patch +++ b/nms-patches/EntityFireworks.patch @@ -1,11 +1,17 @@ --- a/net/minecraft/server/EntityFireworks.java +++ b/net/minecraft/server/EntityFireworks.java -@@ -77,7 +77,7 @@ +@@ -117,8 +117,12 @@ } if (!this.world.isClientSide && this.ticksFlown > this.expectedLifespan) { - this.world.broadcastEntityEffect(this, (byte) 17); -+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) this.world.broadcastEntityEffect(this, (byte) 17); // CraftBukkit +- this.k(); ++ // CraftBukkit start ++ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) { ++ this.world.broadcastEntityEffect(this, (byte) 17); ++ this.k(); ++ } ++ // CraftBukkit end this.die(); } |