summaryrefslogtreecommitdiffstats
path: root/nms-patches/ShapelessRecipes.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2017-05-19 21:00:13 +1000
committermd_5 <git@md-5.net>2017-05-19 21:00:13 +1000
commit10043529907a4ba913ebe2712876e4b1911263b8 (patch)
tree37f3cbb2527d02eac320ed0900bf92a4f3c8407c /nms-patches/ShapelessRecipes.patch
parent3ecbb59cbb9e20064d04628d26387742705ab9ac (diff)
downloadcraftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar
craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar.gz
craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar.lz
craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar.xz
craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.zip
Update to Minecraft 1.12-pre5
Diffstat (limited to 'nms-patches/ShapelessRecipes.patch')
-rw-r--r--nms-patches/ShapelessRecipes.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/ShapelessRecipes.patch b/nms-patches/ShapelessRecipes.patch
index cbe208aa..914c0af9 100644
--- a/nms-patches/ShapelessRecipes.patch
+++ b/nms-patches/ShapelessRecipes.patch
@@ -1,7 +1,7 @@
--- a/net/minecraft/server/ShapelessRecipes.java
+++ b/net/minecraft/server/ShapelessRecipes.java
-@@ -5,6 +5,10 @@
- import com.google.gson.JsonObject;
+@@ -6,6 +6,10 @@
+ import com.google.gson.JsonParseException;
import java.util.ArrayList;
import java.util.Iterator;
+// CraftBukkit start
@@ -11,7 +11,7 @@
public class ShapelessRecipes extends IRecipe {
-@@ -17,6 +21,21 @@
+@@ -18,6 +22,21 @@
this.ingredients = nonnulllist;
}