Update to Minecraft 1.11

By: md_5 <git@md-5.net>
2016-11-17 12:41:03 +11:00
parent 49bc1c57f9
commit 4e412ab4e3
279 changed files with 3722 additions and 2992 deletions
--- a/paper-server/nms-patches/BlockJukeBox.patch
+++ b/paper-server/nms-patches/BlockJukeBox.patch
@@ -1,12 +1,12 @@
 --- a/net/minecraft/server/BlockJukeBox.java
 +++ b/net/minecraft/server/BlockJukeBox.java
-@@ -144,6 +144,11 @@
+@@ -143,6 +143,11 @@
         }
 
-         public void setRecord(@Nullable ItemStack itemstack) {
+         public void setRecord(ItemStack itemstack) {
 +            // CraftBukkit start - There can only be one
-+            if (itemstack != null) {
-+                itemstack.count = 1;
+            if (!itemstack.isEmpty()) {
+                itemstack.setCount(1);
 +            }
 +            // CraftBukkit end
             this.record = itemstack;