diff options
| author | DemonWav <demonwav@gmail.com> | 2015-09-30 09:02:11 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2015-09-30 09:02:11 +1000 |
| commit | d4e32cef0caaa8a81f0fe60216554fd7e0b922cb (patch) | |
| tree | 9f49a54f23fb29e61613b0dbe913602826dd2764 /nms-patches | |
| parent | 8cc1683e83cf62458971ef6c56cb5d32a5dc780b (diff) | |
| download | craftbukkit-d4e32cef0caaa8a81f0fe60216554fd7e0b922cb.tar craftbukkit-d4e32cef0caaa8a81f0fe60216554fd7e0b922cb.tar.gz craftbukkit-d4e32cef0caaa8a81f0fe60216554fd7e0b922cb.tar.lz craftbukkit-d4e32cef0caaa8a81f0fe60216554fd7e0b922cb.tar.xz craftbukkit-d4e32cef0caaa8a81f0fe60216554fd7e0b922cb.zip | |
SPIGOT-759: Add FireworkExplodeEvent.
Diffstat (limited to 'nms-patches')
| -rw-r--r-- | nms-patches/EntityFireworks.patch | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/nms-patches/EntityFireworks.patch b/nms-patches/EntityFireworks.patch index 8b137891..4da644db 100644 --- a/nms-patches/EntityFireworks.patch +++ b/nms-patches/EntityFireworks.patch @@ -1 +1,11 @@ - +--- a/net/minecraft/server/EntityFireworks.java ++++ b/net/minecraft/server/EntityFireworks.java +@@ -78,7 +78,7 @@ + } + + 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); + this.die(); + } + |