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,8 +1,8 @@
--- a/net/minecraft/server/EntityMinecartContainer.java
+++ b/net/minecraft/server/EntityMinecartContainer.java
@@ -3,6 +3,13 @@
@@ -2,6 +2,13 @@
import java.util.Iterator;
import java.util.Random;
import javax.annotation.Nullable;
+// CraftBukkit start
+import java.util.List;
@@ -12,10 +12,10 @@
+import org.bukkit.inventory.InventoryHolder;
+// CraftBukkit end
public abstract class EntityMinecartContainer extends EntityMinecartAbstract implements ITileInventory, ILootable {
public abstract class EntityMinecartContainer extends EntityMinecartAbstract implements IInventory, ITileInventory {
@@ -11,15 +18,51 @@
private MinecraftKey c;
@@ -11,15 +18,56 @@
public MinecraftKey lootTable;
public long lootTableSeed;
+ // CraftBukkit start
@@ -44,6 +44,11 @@
+ return null;
+ }
+
+ @Override
+ public int getMaxStackSize() {
+ return maxStack;
+ }
+
+ public void setMaxStackSize(int size) {
+ maxStack = size;
+ }
@@ -58,22 +63,13 @@
super(entitytypes, world);
- this.items = NonNullList.a(36, ItemStack.a);
+ this.items = NonNullList.a(this.getSize(), ItemStack.a); // CraftBukkit - SPIGOT-3513
this.b = true;
this.c = true;
}
protected EntityMinecartContainer(EntityTypes<?> entitytypes, double d0, double d1, double d2, World world) {
super(entitytypes, world, d0, d1, d2);
- this.items = NonNullList.a(36, ItemStack.a);
+ this.items = NonNullList.a(this.getSize(), ItemStack.a); // CraftBukkit - SPIGOT-3513
this.b = true;
this.c = true;
}
@@ -102,7 +145,7 @@
}
public int getMaxStackSize() {
- return 64;
+ return maxStack; // CraftBukkit
}
@Nullable