diff options
| author | md_5 <git@md-5.net> | 2016-12-22 20:26:27 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-12-22 20:26:27 +1100 |
| commit | e232e1519ef096a2a3e28f312f7f27f6216386a1 (patch) | |
| tree | 286ce87a7931c04b2e72dd9f5069a40aa2011039 /nms-patches/EntityFireworks.patch | |
| parent | 13a5b12206ab39accf3f6bca5ef62227a85930bf (diff) | |
| download | craftbukkit-e232e1519ef096a2a3e28f312f7f27f6216386a1.tar craftbukkit-e232e1519ef096a2a3e28f312f7f27f6216386a1.tar.gz craftbukkit-e232e1519ef096a2a3e28f312f7f27f6216386a1.tar.lz craftbukkit-e232e1519ef096a2a3e28f312f7f27f6216386a1.tar.xz craftbukkit-e232e1519ef096a2a3e28f312f7f27f6216386a1.zip | |
SPIGOT-2953: Set damager for fireworks
Diffstat (limited to 'nms-patches/EntityFireworks.patch')
| -rw-r--r-- | nms-patches/EntityFireworks.patch | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/nms-patches/EntityFireworks.patch b/nms-patches/EntityFireworks.patch index 9575d172..af6bba54 100644 --- a/nms-patches/EntityFireworks.patch +++ b/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; |