From 2b518036f5f770ea45323c9ca9bacbc0f7d1840c Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Thu, 22 Dec 2016 20:26:27 +1100 Subject: [PATCH] SPIGOT-2953: Set damager for fireworks By: md_5 --- .../nms-patches/EntityFireworks.patch | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/paper-server/nms-patches/EntityFireworks.patch b/paper-server/nms-patches/EntityFireworks.patch index 9575d17203..af6bba54a8 100644 --- a/paper-server/nms-patches/EntityFireworks.patch +++ b/paper-server/nms-patches/EntityFireworks.patch @@ -1,6 +1,14 @@ --- a/net/minecraft/server/EntityFireworks.java +++ b/net/minecraft/server/EntityFireworks.java -@@ -117,8 +117,12 @@ +@@ -2,6 +2,7 @@ + + import java.util.Iterator; + import java.util.List; ++import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit + + public class EntityFireworks extends Entity { + +@@ -117,8 +118,12 @@ } if (!this.world.isClientSide && this.ticksFlown > this.expectedLifespan) { @@ -15,3 +23,13 @@ this.die(); } +@@ -136,7 +141,9 @@ + + if (f > 0.0F) { + if (this.e != null) { ++ CraftEventFactory.entityDamage = this; // CraftBukkit + this.e.damageEntity(DamageSource.t, (float) (5 + nbttaglist.size() * 2)); ++ CraftEventFactory.entityDamage = null; // CraftBukkit + } + + double d0 = 5.0D;