summaryrefslogtreecommitdiffstats
path: root/nms-patches/RecipiesShield.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2017-05-14 12:00:00 +1000
committermd_5 <git@md-5.net>2017-05-14 12:00:00 +1000
commit5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5 (patch)
tree0314ba59f51141bb5e0e7ff6ca7723d168ac94b9 /nms-patches/RecipiesShield.patch
parent6e3cec8bc78269d72ef7ef49ce82a5eadfb9615a (diff)
downloadcraftbukkit-5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5.tar
craftbukkit-5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5.tar.gz
craftbukkit-5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5.tar.lz
craftbukkit-5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5.tar.xz
craftbukkit-5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5.zip
Update to Minecraft 1.12-pre2
Diffstat (limited to 'nms-patches/RecipiesShield.patch')
-rw-r--r--nms-patches/RecipiesShield.patch18
1 files changed, 10 insertions, 8 deletions
diff --git a/nms-patches/RecipiesShield.patch b/nms-patches/RecipiesShield.patch
index 236e726a..e0c90497 100644
--- a/nms-patches/RecipiesShield.patch
+++ b/nms-patches/RecipiesShield.patch
@@ -1,16 +1,18 @@
--- a/net/minecraft/server/RecipiesShield.java
+++ b/net/minecraft/server/RecipiesShield.java
-@@ -9,9 +9,13 @@
- craftingmanager.a(new RecipiesShield.Decoration(null));
- }
+@@ -1,8 +1,15 @@
+ package net.minecraft.server;
-- static class Decoration implements IRecipe {
-+ static class Decoration extends ShapelessRecipes implements IRecipe { // CraftBukkit - added extends
+-public class RecipiesShield { public static class Decoration extends IRecipe {
++// CraftBukkit - decompile weirdness
++public class RecipiesShield {
-- private Decoration() {}
+- public Decoration() {}
++ public static class Decoration extends ShapelessRecipes { // CraftBukkit
++
+ // CraftBukkit start - Delegate to new parent class with bogus info
-+ private Decoration() {
-+ super(new ItemStack(Items.SHIELD, 0 ,0), java.util.Arrays.asList(new ItemStack(Items.BANNER, 0, 0)));
++ public Decoration() {
++ super("", new ItemStack(Items.SHIELD, 0, 0), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.BANNER)));
+ }
+ // CraftBukkit end