summaryrefslogtreecommitdiffstats
path: root/nms-patches/ShapelessRecipes.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/ShapelessRecipes.patch')
-rw-r--r--nms-patches/ShapelessRecipes.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/nms-patches/ShapelessRecipes.patch b/nms-patches/ShapelessRecipes.patch
index 8c3c5cfc..0a1ebf5e 100644
--- a/nms-patches/ShapelessRecipes.patch
+++ b/nms-patches/ShapelessRecipes.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/ShapelessRecipes.java 2014-11-28 17:43:43.373707429 +0000
-+++ src/main/java/net/minecraft/server/ShapelessRecipes.java 2014-11-28 17:38:22.000000000 +0000
+--- /home/matt/mc-dev-private//net/minecraft/server/ShapelessRecipes.java 2015-02-26 22:40:23.083608134 +0000
++++ src/main/java/net/minecraft/server/ShapelessRecipes.java 2015-02-26 22:40:23.083608134 +0000
@@ -5,6 +5,11 @@
import java.util.Iterator;
import java.util.List;
@@ -12,11 +12,10 @@
public class ShapelessRecipes implements IRecipe {
private final ItemStack result;
-@@ -14,6 +19,20 @@
- this.result = itemstack;
+@@ -15,6 +20,20 @@
this.ingredients = list;
}
-+
+
+ // CraftBukkit start
+ @SuppressWarnings("unchecked")
+ public org.bukkit.inventory.ShapelessRecipe toBukkitRecipe() {
@@ -30,6 +29,7 @@
+ return recipe;
+ }
+ // CraftBukkit end
-
++
public ItemStack b() {
return this.result;
+ }