twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-19 14:23:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.12-pre2

Browse Source
This commit is contained in:
md_5
2017-05-14 12:00:00 +10:00
parent 6e3cec8bc7
commit 5195487ec6
210 changed files with 2280 additions and 1974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
nms-patches/RecipiesShield.patch
View File

@@ -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