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/ShapedRecipes.patch
+++ b/paper-server/nms-patches/ShapedRecipes.patch
@@ -1,17 +1,17 @@
 --- a/net/minecraft/server/ShapedRecipes.java
 +++ b/net/minecraft/server/ShapedRecipes.java
-@@ -1,6 +1,10 @@
+@@ -1,5 +1,10 @@
 package net.minecraft.server;
 
- import javax.annotation.Nullable;
 +// CraftBukkit start
 +import org.bukkit.craftbukkit.inventory.CraftItemStack;
 +import org.bukkit.craftbukkit.inventory.CraftShapedRecipe;
 +// CraftBukkit end
- 
+
 public class ShapedRecipes implements IRecipe {
 
-@@ -17,6 +21,62 @@
+     private final int width;
+@@ -22,6 +27,62 @@
         this.result = itemstack;
     }
 
@@ -71,6 +71,6 @@
 +    }
 +    // CraftBukkit end
 +
-     @Nullable
     public ItemStack b() {
         return this.result;
+     }