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/RecipeRepair.java 2014-11-28 17:43:43.357707429 +0000
+++ src/main/java/net/minecraft/server/RecipeRepair.java 2014-11-28 17:38:23.000000000 +0000
--- /home/matt/mc-dev-private//net/minecraft/server/RecipeRepair.java 2015-02-26 22:40:23.051608134 +0000
+++ src/main/java/net/minecraft/server/RecipeRepair.java 2015-02-26 22:40:23.055608134 +0000
@@ -3,9 +3,13 @@
import com.google.common.collect.Lists;
import java.util.ArrayList;
@@ -16,13 +16,11 @@
public boolean a(InventoryCrafting inventorycrafting, World world) {
ArrayList arraylist = Lists.newArrayList();
@@ -61,8 +65,18 @@
if (i1 < 0) {
@@ -62,7 +66,17 @@
i1 = 0;
}
-
- return new ItemStack(itemstack2.getItem(), 1, i1);
+
+ // CraftBukkit start - Construct a dummy repair recipe
+ ItemStack result = new ItemStack(itemstack.getItem(), 1, i1);
+ java.util.List<ItemStack> ingredients = new ArrayList<ItemStack>();