Update to Minecraft 1.12-pre2

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2017-05-14 12:00:00 +10:00
parent b8446f770b
commit 40c8954e17
210 changed files with 2280 additions and 1974 deletions

View File

@@ -1,9 +1,13 @@
--- a/net/minecraft/server/IRecipe.java
+++ b/net/minecraft/server/IRecipe.java
@@ -11,4 +11,6 @@
ItemStack b();
@@ -28,7 +28,9 @@
return ((MinecraftKey) CraftingManager.recipes.b(this)).a((MinecraftKey) CraftingManager.recipes.b(irecipe));
}
NonNullList<ItemStack> b(InventoryCrafting inventorycrafting);
- public int compareTo(Object object) {
+ public int compareTo(IRecipe object) { // CraftBukkit = decompile error
return this.a((IRecipe) object);
}
+
+ org.bukkit.inventory.Recipe toBukkitRecipe(); // CraftBukkit
+ public abstract org.bukkit.inventory.Recipe toBukkitRecipe(); // CraftBukkit
}