diff options
| author | md_5 <git@md-5.net> | 2017-05-14 12:00:00 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2017-05-14 12:00:00 +1000 |
| commit | 5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5 (patch) | |
| tree | 0314ba59f51141bb5e0e7ff6ca7723d168ac94b9 /nms-patches/RecipesBanner.patch | |
| parent | 6e3cec8bc78269d72ef7ef49ce82a5eadfb9615a (diff) | |
| download | craftbukkit-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/RecipesBanner.patch')
| -rw-r--r-- | nms-patches/RecipesBanner.patch | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/nms-patches/RecipesBanner.patch b/nms-patches/RecipesBanner.patch index 3de6f89e..06e3cbee 100644 --- a/nms-patches/RecipesBanner.patch +++ b/nms-patches/RecipesBanner.patch @@ -1,32 +1,35 @@ --- a/net/minecraft/server/RecipesBanner.java +++ b/net/minecraft/server/RecipesBanner.java -@@ -20,9 +20,13 @@ - craftingmanager.a(new RecipesBanner.AddRecipe(null)); - } +@@ -2,9 +2,16 @@ + + import javax.annotation.Nullable; -- static class AddRecipe implements IRecipe { -+ static class AddRecipe extends ShapelessRecipes implements IRecipe { // CraftBukkit - added extends +-public class RecipesBanner { public static class AddRecipe extends IRecipe { ++// CraftBukkit - decompile weirdness ++public class RecipesBanner { -- private AddRecipe() {} +- public AddRecipe() {} ++ public static class AddRecipe extends ShapelessRecipes { // CraftBukkit ++ + // CraftBukkit start - Delegate to new parent class with bogus info -+ private AddRecipe() { -+ super(new ItemStack(Items.BANNER, 0, 0), java.util.Arrays.asList(new ItemStack(Items.BANNER))); ++ public AddRecipe() { ++ super("", new ItemStack(Items.BANNER, 0, 0), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.BANNER))); + } + // CraftBukkit end public boolean a(InventoryCrafting inventorycrafting, World world) { boolean flag = false; -@@ -208,9 +212,13 @@ +@@ -186,9 +193,13 @@ } } -- static class DuplicateRecipe implements IRecipe { -+ static class DuplicateRecipe extends ShapelessRecipes implements IRecipe { // CraftBukkit - added extends +- public static class DuplicateRecipe extends IRecipe { ++ public static class DuplicateRecipe extends ShapelessRecipes { // CraftBukkit - added extends -- private DuplicateRecipe() {} +- public DuplicateRecipe() {} + // CraftBukkit start - Delegate to new parent class with bogus info -+ private DuplicateRecipe() { -+ super(new ItemStack(Items.BANNER, 0, 0), java.util.Arrays.asList(new ItemStack(Items.DYE, 0, 5))); ++ public DuplicateRecipe() { ++ super("", new ItemStack(Items.BANNER, 0, 0), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.DYE))); + } + // CraftBukkit end |