Update to Minecraft 1.8

For more information please see http://www.spigotmc.org/ By: Thinkofdeath <thinkofdeath@spigotmc.org>
2014-11-26 08:32:16 +11:00
parent 2f44d66966
commit a419776f3c
347 changed files with 22151 additions and 1209 deletions
--- a/paper-server/nms-patches/ShapelessRecipes.patch
+++ b/paper-server/nms-patches/ShapelessRecipes.patch
@@ -0,0 +1,35 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/ShapelessRecipes.java	2014-11-27 08:59:46.889421019 +1100
+++ src/main/java/net/minecraft/server/ShapelessRecipes.java	2014-11-27 08:42:10.128850958 +1100
+@@ -5,6 +5,11 @@
+ import java.util.Iterator;
+ import java.util.List;
+ 
+// CraftBukkit start
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.inventory.CraftShapelessRecipe;
+// CraftBukkit end
+
+ public class ShapelessRecipes implements IRecipe {
+ 
+     private final ItemStack result;
+@@ -14,6 +19,20 @@
+         this.result = itemstack;
+         this.ingredients = list;
+     }
+    
+    // CraftBukkit start
+    @SuppressWarnings("unchecked")
+    public org.bukkit.inventory.ShapelessRecipe toBukkitRecipe() {
+        CraftItemStack result = CraftItemStack.asCraftMirror(this.result);
+        CraftShapelessRecipe recipe = new CraftShapelessRecipe(result, this);
+        for (ItemStack stack : (List<ItemStack>) this.ingredients) {
+            if (stack != null) {
+                recipe.addIngredient(org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(stack.getItem()), stack.getData());
+            }
+        }
+        return recipe;
+    }
+    // CraftBukkit end
+ 
+     public ItemStack b() {
+         return this.result;