Update to Minecraft 1.14-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/InventoryCraftResult.java
+++ b/net/minecraft/server/InventoryCraftResult.java
@@ -2,12 +2,45 @@
@@ -2,12 +2,50 @@
import java.util.Iterator;
import javax.annotation.Nullable;
@@ -13,7 +13,7 @@
public class InventoryCraftResult implements IInventory, RecipeHolder {
private final NonNullList<ItemStack> items;
private IRecipe b;
private IRecipe<?> b;
+ // CraftBukkit start
+ private int maxStack = MAX_STACK;
@@ -33,6 +33,11 @@
+ return new java.util.ArrayList<HumanEntity>();
+ }
+
+ @Override
+ public int getMaxStackSize() {
+ return maxStack;
+ }
+
+ public void setMaxStackSize(int size) {
+ maxStack = size;
+ }
@@ -46,12 +51,3 @@
public InventoryCraftResult() {
this.items = NonNullList.a(1, ItemStack.a);
}
@@ -62,7 +95,7 @@
}
public int getMaxStackSize() {
- return 64;
+ return maxStack; // CraftBukkit
}
public void update() {}