Update to Minecraft 1.13-pre7

This commit is contained in:
md_5
2018-07-15 10:00:00 +10:00
parent 57ab4cfc6f
commit 421c1728c8
608 changed files with 17788 additions and 9378 deletions

View File

@@ -1,18 +1,18 @@
--- a/net/minecraft/server/TileEntityShulkerBox.java
+++ b/net/minecraft/server/TileEntityShulkerBox.java
@@ -3,6 +3,10 @@
import java.util.Iterator;
@@ -4,6 +4,10 @@
import java.util.List;
import java.util.stream.IntStream;
import javax.annotation.Nullable;
+// CraftBukkit start
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+import org.bukkit.entity.HumanEntity;
+// CraftBukkit end
public class TileEntityShulkerBox extends TileEntityLootable implements ITickable, IWorldInventory {
public class TileEntityShulkerBox extends TileEntityLootable implements IWorldInventory, ITickable {
@@ -16,6 +20,31 @@
private EnumColor l;
@@ -18,6 +22,31 @@
private boolean o;
private boolean p;
+ // CraftBukkit start - add fields and methods
@@ -20,7 +20,7 @@
+ private int maxStack = MAX_STACK;
+
+ public List<ItemStack> getContents() {
+ return this.f;
+ return this.e;
+ }
+
+ public void onOpen(CraftHumanEntity who) {
@@ -40,10 +40,10 @@
+ }
+ // CraftBukkit end
+
public TileEntityShulkerBox() {
this((EnumColor) null);
}
@@ -144,7 +173,7 @@
public TileEntityShulkerBox(@Nullable EnumColor enumcolor) {
super(TileEntityTypes.x);
this.e = NonNullList.a(27, ItemStack.a);
@@ -148,7 +177,7 @@
}
public int getMaxStackSize() {