Paper/nms-patches/InventoryLargeChest.patch

75 lines
2.2 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/InventoryLargeChest.java
+++ b/net/minecraft/server/InventoryLargeChest.java
2016-05-10 13:47:39 +02:00
@@ -1,6 +1,13 @@
package net.minecraft.server;
2016-05-10 13:47:39 +02:00
import javax.annotation.Nullable;
+// CraftBukkit start
+import java.util.List;
2016-02-29 22:32:46 +01:00
+import org.bukkit.Location;
+
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+import org.bukkit.entity.HumanEntity;
+// CraftBukkit end
2016-05-10 13:47:39 +02:00
public class InventoryLargeChest implements ITileInventory {
2016-05-10 13:47:39 +02:00
@@ -8,6 +15,48 @@
2016-06-09 03:43:49 +02:00
public final ITileInventory left;
public final ITileInventory right;
+ // CraftBukkit start - add fields and methods
+ public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
+
+ public ItemStack[] getContents() {
+ ItemStack[] result = new ItemStack[this.getSize()];
+ for (int i = 0; i < result.length; i++) {
+ result[i] = this.getItem(i);
+ }
+ return result;
+ }
+
+ public void onOpen(CraftHumanEntity who) {
+ this.left.onOpen(who);
+ this.right.onOpen(who);
+ transaction.add(who);
+ }
+
+ public void onClose(CraftHumanEntity who) {
+ this.left.onClose(who);
+ this.right.onClose(who);
+ transaction.remove(who);
+ }
+
+ public List<HumanEntity> getViewers() {
+ return transaction;
+ }
+
+ public org.bukkit.inventory.InventoryHolder getOwner() {
+ return null; // This method won't be called since CraftInventoryDoubleChest doesn't defer to here
+ }
+
+ public void setMaxStackSize(int size) {
+ this.left.setMaxStackSize(size);
+ this.right.setMaxStackSize(size);
+ }
2016-02-29 22:32:46 +01:00
+
+ @Override
+ public Location getLocation() {
+ return left.getLocation(); // TODO: right?
+ }
+ // CraftBukkit end
+
public InventoryLargeChest(String s, ITileInventory itileinventory, ITileInventory itileinventory1) {
this.a = s;
if (itileinventory == null) {
2016-05-10 13:47:39 +02:00
@@ -73,7 +122,7 @@
}
public int getMaxStackSize() {
- return this.left.getMaxStackSize();
+ return Math.min(this.left.getMaxStackSize(), this.right.getMaxStackSize()); // CraftBukkit - check both sides
}
public void update() {