Update to Minecraft 1.12-pre2

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

View File

@@ -1,9 +1,9 @@
--- a/net/minecraft/server/InventoryCraftResult.java
+++ b/net/minecraft/server/InventoryCraftResult.java
@@ -1,11 +1,44 @@
package net.minecraft.server;
@@ -2,12 +2,45 @@
import java.util.Iterator;
import javax.annotation.Nullable;
+// CraftBukkit start
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
@@ -13,6 +13,7 @@
public class InventoryCraftResult implements IInventory {
private final NonNullList<ItemStack> items;
private IRecipe b;
+ // CraftBukkit start
+ private int maxStack = MAX_STACK;
@@ -45,7 +46,7 @@
public InventoryCraftResult() {
this.items = NonNullList.a(1, ItemStack.a);
}
@@ -59,7 +92,7 @@
@@ -61,7 +94,7 @@
}
public int getMaxStackSize() {