diff options
| author | md_5 <git@md-5.net> | 2016-12-21 07:00:00 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-12-21 07:00:00 +1100 |
| commit | 8ea0c87f515290c35baf0029f7b2e046c1ff49cb (patch) | |
| tree | 3ac51dcfdc206a175b73ec4013bd53c423e9b6e4 /nms-patches/EntityFireworks.patch | |
| parent | c8ff65136f23a3c2770b8d9ca508f61927f8acba (diff) | |
| download | craftbukkit-8ea0c87f515290c35baf0029f7b2e046c1ff49cb.tar craftbukkit-8ea0c87f515290c35baf0029f7b2e046c1ff49cb.tar.gz craftbukkit-8ea0c87f515290c35baf0029f7b2e046c1ff49cb.tar.lz craftbukkit-8ea0c87f515290c35baf0029f7b2e046c1ff49cb.tar.xz craftbukkit-8ea0c87f515290c35baf0029f7b2e046c1ff49cb.zip | |
Update to Minecraft 1.11.1
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(); } |