craftbukkit/nms-patches/net/minecraft/world/inventory/ContainerChest.patch

69 lines
2.5 KiB
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/world/inventory/ContainerChest.java
+++ b/net/minecraft/world/inventory/ContainerChest.java
2025-02-05 22:54:42 +11:00
@@ -6,10 +6,45 @@
2021-03-16 09:00:00 +11:00
import net.minecraft.world.entity.player.PlayerInventory;
import net.minecraft.world.item.ItemStack;
+// CraftBukkit start
2021-03-16 09:00:00 +11:00
+import net.minecraft.world.InventoryLargeChest;
+import org.bukkit.craftbukkit.inventory.CraftInventory;
+import org.bukkit.craftbukkit.inventory.CraftInventoryView;
+// CraftBukkit end
2016-11-17 12:41:03 +11:00
+
public class ContainerChest extends Container {
2016-06-09 11:43:49 +10:00
private final IInventory container;
2021-06-11 15:00:00 +10:00
private final int containerRows;
+ // 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;
+ }
2024-12-18 07:49:12 +11:00
+
+ @Override
+ public void startOpen() {
2025-02-05 22:54:42 +11:00
+ super.startOpen();
2024-12-18 07:49:12 +11:00
+ this.container.startOpen(this.player.player);
+ }
+ // CraftBukkit end
2019-04-23 12:00:00 +10:00
private ContainerChest(Containers<?> containers, int i, PlayerInventory playerinventory, int j) {
this(containers, i, playerinventory, new InventorySubcontainer(9 * j), j);
2025-02-05 22:54:42 +11:00
@@ -52,7 +87,10 @@
2024-12-18 07:49:12 +11:00
checkContainerSize(iinventory, j * 9);
2024-10-23 02:15:00 +11:00
this.container = iinventory;
this.containerRows = j;
2024-12-18 07:49:12 +11:00
- iinventory.startOpen(playerinventory.player);
+ // iinventory.startOpen(playerinventory.player); // CraftBukkit - don't startOpen until menu actually opens
+ // CraftBukkit start - Save player
2019-04-23 12:00:00 +10:00
+ this.player = playerinventory;
+ // CraftBukkit end
2024-10-23 02:15:00 +11:00
boolean flag = true;
2015-02-26 22:41:06 +00:00
2024-10-23 02:15:00 +11:00
this.addChestGrid(iinventory, 8, 18);
2025-02-05 22:54:42 +11:00
@@ -72,6 +110,7 @@
2019-04-23 12:00:00 +10:00
@Override
2021-11-22 09:00:00 +11:00
public boolean stillValid(EntityHuman entityhuman) {
+ if (!this.checkReachable) return true; // CraftBukkit
2021-11-22 09:00:00 +11:00
return this.container.stillValid(entityhuman);
}