Update to Minecraft 1.11.1

By: md_5 <git@md-5.net>
2016-12-21 07:00:00 +11:00
parent 74902a47aa
commit f9a809b2ba
29 changed files with 368 additions and 334 deletions
--- a/paper-server/nms-patches/EntityFireworks.patch
+++ b/paper-server/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();
         }