From 9e2d39cd269c0f16f59edec3491459e3e58a6dfc Mon Sep 17 00:00:00 2001
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Date: Tue, 24 Dec 2024 22:57:24 +0100
Subject: [PATCH] Fix double chest identification (#11812)

---
 .../server/level/ServerPlayer.java.patch      |  2 +-
 .../world/level/block/ChestBlock.java.patch   | 48 ++++++++++++-------
 .../inventory/CraftInventoryDoubleChest.java  |  6 +--
 3 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/paper-server/patches/sources/net/minecraft/server/level/ServerPlayer.java.patch b/paper-server/patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
index c32e052b23..662414567d 100644
--- a/paper-server/patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
+++ b/paper-server/patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
@@ -919,7 +919,7 @@
 +                        ((Container) menu).stopOpen(this);
 +                    } else if (menu instanceof net.minecraft.world.level.block.ChestBlock.DoubleInventory doubleInventory) {
 +                        // SPIGOT-5355 - double chests too :(
-+                        doubleInventory.inventorylargechest.stopOpen(this);
++                        doubleInventory.container.stopOpen(this);
 +                        // Paper start - Fix InventoryOpenEvent cancellation
 +                    } else if (!this.enderChestInventory.isActiveChest(null)) {
 +                        this.enderChestInventory.stopOpen(this);
diff --git a/paper-server/patches/sources/net/minecraft/world/level/block/ChestBlock.java.patch b/paper-server/patches/sources/net/minecraft/world/level/block/ChestBlock.java.patch
index 55671a0957..5ec5cd486d 100644
--- a/paper-server/patches/sources/net/minecraft/world/level/block/ChestBlock.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/level/block/ChestBlock.java.patch
@@ -1,39 +1,53 @@
 --- a/net/minecraft/world/level/block/ChestBlock.java
 +++ b/net/minecraft/world/level/block/ChestBlock.java
-@@ -120,6 +_,38 @@
+@@ -85,7 +_,7 @@
+         @Override
+         public Optional<MenuProvider> acceptDouble(final ChestBlockEntity first, final ChestBlockEntity second) {
+             final Container container = new CompoundContainer(first, second);
+-            return Optional.of(new MenuProvider() {
++            return Optional.of(DoubleInventory.wrap(new MenuProvider() { // CraftBukkit - wrap for identification
+                 @Nullable
+                 @Override
+                 public AbstractContainerMenu createMenu(int containerId, Inventory playerInventory, Player player) {
+@@ -106,7 +_,7 @@
+                         return (Component)(second.hasCustomName() ? second.getDisplayName() : Component.translatable("container.chestDouble"));
+                     }
+                 }
+-            });
++            }, (CompoundContainer) container)); // CraftBukkit - wrap for identification
+         }
+ 
+         @Override
+@@ -120,6 +_,34 @@
          }
      };
  
 +    // CraftBukkit start
 +    public static class DoubleInventory implements MenuProvider {
 +
-+        private final ChestBlockEntity tileentitychest;
-+        private final ChestBlockEntity tileentitychest1;
-+        public final CompoundContainer inventorylargechest;
++        private final MenuProvider delegate;
++        public final CompoundContainer container; // expose to api
 +
-+        public DoubleInventory(ChestBlockEntity tileentitychest, ChestBlockEntity tileentitychest1, CompoundContainer inventorylargechest) {
-+            this.tileentitychest = tileentitychest;
-+            this.tileentitychest1 = tileentitychest1;
-+            this.inventorylargechest = inventorylargechest;
++        private DoubleInventory(MenuProvider delegate, CompoundContainer container) {
++            this.delegate = delegate;
++            this.container = container;
++        }
++
++        public static DoubleInventory wrap(MenuProvider delegate, CompoundContainer container) {
++            return new DoubleInventory(delegate, container);
 +        }
 +
 +        @Nullable
 +        @Override
 +        public AbstractContainerMenu createMenu(int syncId, Inventory playerInventory, Player player) {
-+            if (this.tileentitychest.canOpen(player) && this.tileentitychest1.canOpen(player)) {
-+                this.tileentitychest.unpackLootTable(playerInventory.player);
-+                this.tileentitychest1.unpackLootTable(playerInventory.player);
-+                return ChestMenu.sixRows(syncId, playerInventory, this.inventorylargechest);
-+            } else {
-+                return null;
-+            }
++            return this.delegate.createMenu(syncId, playerInventory, player);
 +        }
 +
 +        @Override
 +        public Component getDisplayName() {
-+            return (Component) (this.tileentitychest.hasCustomName() ? this.tileentitychest.getDisplayName() : (this.tileentitychest1.hasCustomName() ? this.tileentitychest1.getDisplayName() : Component.translatable("container.chestDouble")));
++            return this.delegate.getDisplayName();
 +        }
-+    };
++    }
 +    // CraftBukkit end
 +
      @Override
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java
index c3e2c9e2c3..67f9ec03c4 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java
@@ -16,10 +16,10 @@ public class CraftInventoryDoubleChest extends CraftInventory implements DoubleC
     private final CraftInventory right;
 
     public CraftInventoryDoubleChest(ChestBlock.DoubleInventory block) {
-        super(block.inventorylargechest);
+        super(block.container);
         this.tile = block;
-        this.left = new CraftInventory(block.inventorylargechest.container1);
-        this.right = new CraftInventory(block.inventorylargechest.container2);
+        this.left = new CraftInventory(block.container.container1);
+        this.right = new CraftInventory(block.container.container2);
     }
 
     public CraftInventoryDoubleChest(CompoundContainer largeChest) {