2021-03-15 23:00:00 +01:00
|
|
|
--- a/net/minecraft/world/inventory/ContainerChest.java
|
|
|
|
+++ b/net/minecraft/world/inventory/ContainerChest.java
|
2021-06-11 07:00:00 +02:00
|
|
|
@@ -6,11 +6,40 @@
|
2021-03-15 23:00:00 +01:00
|
|
|
import net.minecraft.world.entity.player.PlayerInventory;
|
|
|
|
import net.minecraft.world.item.ItemStack;
|
2014-11-25 22:32:16 +01:00
|
|
|
|
|
|
|
+// CraftBukkit start
|
2021-03-15 23:00:00 +01:00
|
|
|
+import net.minecraft.world.InventoryLargeChest;
|
2014-11-25 22:32:16 +01:00
|
|
|
+import org.bukkit.craftbukkit.inventory.CraftInventory;
|
|
|
|
+import org.bukkit.craftbukkit.inventory.CraftInventoryView;
|
|
|
|
+// CraftBukkit end
|
2016-11-17 02:41:03 +01:00
|
|
|
+
|
2014-11-25 22:32:16 +01:00
|
|
|
public class ContainerChest extends Container {
|
|
|
|
|
2021-06-11 07:00:00 +02:00
|
|
|
private static final int SLOTS_PER_ROW = 9;
|
2016-06-09 03:43:49 +02:00
|
|
|
private final IInventory container;
|
2021-06-11 07:00:00 +02:00
|
|
|
private final int containerRows;
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // CraftBukkit start
|
|
|
|
+ private CraftInventoryView bukkitEntity = null;
|
|
|
|
+ private PlayerInventory player;
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public CraftInventoryView getBukkitView() {
|
|
|
|
+ if (bukkitEntity != null) {
|
|
|
|
+ return bukkitEntity;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ CraftInventory inventory;
|
|
|
|
+ if (this.container instanceof PlayerInventory) {
|
|
|
|
+ inventory = new org.bukkit.craftbukkit.inventory.CraftInventoryPlayer((PlayerInventory) this.container);
|
|
|
|
+ } else if (this.container instanceof InventoryLargeChest) {
|
|
|
|
+ inventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest((InventoryLargeChest) this.container);
|
|
|
|
+ } else {
|
|
|
|
+ inventory = new CraftInventory(this.container);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ bukkitEntity = new CraftInventoryView(this.player.player.getBukkitEntity(), inventory, this);
|
|
|
|
+ return bukkitEntity;
|
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
2019-04-23 04:00:00 +02:00
|
|
|
private ContainerChest(Containers<?> containers, int i, PlayerInventory playerinventory, int j) {
|
|
|
|
this(containers, i, playerinventory, new InventorySubcontainer(9 * j), j);
|
2021-06-11 07:00:00 +02:00
|
|
|
@@ -56,6 +85,10 @@
|
2019-04-23 04:00:00 +02:00
|
|
|
iinventory.startOpen(playerinventory.player);
|
2021-06-11 07:00:00 +02:00
|
|
|
int k = (this.containerRows - 4) * 18;
|
2015-02-26 23:41:06 +01:00
|
|
|
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // CraftBukkit start - Save player
|
2019-04-23 04:00:00 +02:00
|
|
|
+ this.player = playerinventory;
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // CraftBukkit end
|
2015-02-26 23:41:06 +01:00
|
|
|
+
|
2019-04-23 04:00:00 +02:00
|
|
|
int l;
|
|
|
|
int i1;
|
2015-02-26 23:41:06 +01:00
|
|
|
|
2021-06-11 07:00:00 +02:00
|
|
|
@@ -79,6 +112,7 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
|
2019-04-23 04:00:00 +02:00
|
|
|
@Override
|
2021-11-21 23:00:00 +01:00
|
|
|
public boolean stillValid(EntityHuman entityhuman) {
|
2014-11-25 22:32:16 +01:00
|
|
|
+ if (!this.checkReachable) return true; // CraftBukkit
|
2021-11-21 23:00:00 +01:00
|
|
|
return this.container.stillValid(entityhuman);
|
2014-11-25 22:32:16 +01:00
|
|
|
}
|
|
|
|
|