Update to Minecraft 1.8.3

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions

View File

@@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/ShapelessRecipes.java 2014-11-28 17:43:43.373707429 +0000
+++ src/main/java/net/minecraft/server/ShapelessRecipes.java 2014-11-28 17:38:22.000000000 +0000
--- /home/matt/mc-dev-private//net/minecraft/server/ShapelessRecipes.java 2015-02-26 22:40:23.083608134 +0000
+++ src/main/java/net/minecraft/server/ShapelessRecipes.java 2015-02-26 22:40:23.083608134 +0000
@@ -5,6 +5,11 @@
import java.util.Iterator;
import java.util.List;
@@ -12,11 +12,10 @@
public class ShapelessRecipes implements IRecipe {
private final ItemStack result;
@@ -14,6 +19,20 @@
this.result = itemstack;
@@ -15,6 +20,20 @@
this.ingredients = list;
}
+
+ // CraftBukkit start
+ @SuppressWarnings("unchecked")
+ public org.bukkit.inventory.ShapelessRecipe toBukkitRecipe() {
@@ -30,6 +29,7 @@
+ return recipe;
+ }
+ // CraftBukkit end
+
public ItemStack b() {
return this.result;
}