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,6 +1,6 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/InventoryCrafting.java 2014-11-28 17:43:43.201707433 +0000
+++ src/main/java/net/minecraft/server/InventoryCrafting.java 2014-11-28 17:38:19.000000000 +0000
@@ -1,11 +1,61 @@
--- /home/matt/mc-dev-private//net/minecraft/server/InventoryCrafting.java 2015-02-26 22:40:22.763608137 +0000
+++ src/main/java/net/minecraft/server/InventoryCrafting.java 2015-02-26 22:40:22.763608137 +0000
@@ -1,5 +1,13 @@
package net.minecraft.server;
+// CraftBukkit start
@@ -14,10 +14,10 @@
public class InventoryCrafting implements IInventory {
private final ItemStack[] items;
private final int b;
@@ -7,6 +15,48 @@
private final int c;
private final Container d;
+
+ // CraftBukkit start - add fields
+ public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
+ public IRecipe currentRecipe;
@@ -58,7 +58,8 @@
+ this(container, i, j);
+ this.owner = player;
+ }
+ // CraftBukkit end
+ // CraftBukkit end
+
public InventoryCrafting(Container container, int i, int j) {
int k = i * j;