summaryrefslogtreecommitdiffstats
path: root/nms-patches/ShapelessRecipes.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2017-05-16 21:22:07 +1000
committermd_5 <git@md-5.net>2017-05-16 21:22:07 +1000
commit45102fcf284d3c713d3f161123e0771396475b21 (patch)
tree53efb9a181964dfc5aa6482ec1bfa803db310c31 /nms-patches/ShapelessRecipes.patch
parentc4102405677265a3369ea42b20c9061b858e4f59 (diff)
downloadcraftbukkit-45102fcf284d3c713d3f161123e0771396475b21.tar
craftbukkit-45102fcf284d3c713d3f161123e0771396475b21.tar.gz
craftbukkit-45102fcf284d3c713d3f161123e0771396475b21.tar.lz
craftbukkit-45102fcf284d3c713d3f161123e0771396475b21.tar.xz
craftbukkit-45102fcf284d3c713d3f161123e0771396475b21.zip
Misc advancement / recipe reload fixes including SPIGOT-3240
Diffstat (limited to 'nms-patches/ShapelessRecipes.patch')
-rw-r--r--nms-patches/ShapelessRecipes.patch10
1 files changed, 2 insertions, 8 deletions
diff --git a/nms-patches/ShapelessRecipes.patch b/nms-patches/ShapelessRecipes.patch
index ff95bff6..cbe208aa 100644
--- a/nms-patches/ShapelessRecipes.patch
+++ b/nms-patches/ShapelessRecipes.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/ShapelessRecipes.java
+++ b/net/minecraft/server/ShapelessRecipes.java
-@@ -5,11 +5,16 @@
+@@ -5,6 +5,10 @@
import com.google.gson.JsonObject;
import java.util.ArrayList;
import java.util.Iterator;
@@ -11,13 +11,7 @@
public class ShapelessRecipes extends IRecipe {
- private final ItemStack result;
- private final NonNullList<RecipeItemStack> ingredients;
-+ public MinecraftKey key; // CraftBukkit
-
- public ShapelessRecipes(String s, ItemStack itemstack, NonNullList<RecipeItemStack> nonnulllist) {
- super(s);
-@@ -17,6 +22,21 @@
+@@ -17,6 +21,21 @@
this.ingredients = nonnulllist;
}