update cached variable when opening enderchest menu, fixes #1367

PurpurMC · Jul 9, 2023 · 51a7c69 · 51a7c69
1 parent 5ee0c1b
commit 51a7c69
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/patches/server/0010-Barrels-and-enderchests-6-rows.patch b/patches/server/0010-Barrels-and-enderchests-6-rows.patch
@@ -108,10 +108,10 @@ index 4703f23316f82a1a942907b46d2d6dcb7d70ec37..162798f57a05b78121fa6c4fadf5adee
          this.activeChest = blockEntity;
      }
 diff --git a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
-index 7385e91f32f070e86a4e0fd3d214f55d832c7979..c3b78dd2d06be7d64920c6bcffcd16c82caa52b4 100644
+index 7385e91f32f070e86a4e0fd3d214f55d832c7979..7b73de87236a60ce7343c29ec147e1866b448ba3 100644
 --- a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
-@@ -85,6 +85,27 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
+@@ -85,6 +85,34 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
                  EnderChestBlockEntity enderChestBlockEntity = (EnderChestBlockEntity)blockEntity;
                  playerEnderChestContainer.setActiveChest(enderChestBlockEntity);
                  player.openMenu(new SimpleMenuProvider((syncId, inventory, playerx) -> {
@@ -120,19 +120,26 @@ index 7385e91f32f070e86a4e0fd3d214f55d832c7979..c3b78dd2d06be7d64920c6bcffcd16c8
 +                        if (org.purpurmc.purpur.PurpurConfig.enderChestPermissionRows) {
 +                            org.bukkit.craftbukkit.entity.CraftHumanEntity bukkitPlayer = player.getBukkitEntity();
 +                            if (bukkitPlayer.hasPermission("purpur.enderchest.rows.six")) {
++                                player.sixRowEnderchestSlotCount = 54;
 +                                return ChestMenu.sixRows(syncId, inventory, playerEnderChestContainer);
 +                            } else if (bukkitPlayer.hasPermission("purpur.enderchest.rows.five")) {
++                                player.sixRowEnderchestSlotCount = 45;
 +                                return ChestMenu.fiveRows(syncId, inventory, playerEnderChestContainer);
 +                            } else if (bukkitPlayer.hasPermission("purpur.enderchest.rows.four")) {
++                                player.sixRowEnderchestSlotCount = 36;
 +                                return ChestMenu.fourRows(syncId, inventory, playerEnderChestContainer);
 +                            } else if (bukkitPlayer.hasPermission("purpur.enderchest.rows.three")) {
++                                player.sixRowEnderchestSlotCount = 27;
 +                                return ChestMenu.threeRows(syncId, inventory, playerEnderChestContainer);
 +                            } else if (bukkitPlayer.hasPermission("purpur.enderchest.rows.two")) {
++                                player.sixRowEnderchestSlotCount = 18;
 +                                return ChestMenu.twoRows(syncId, inventory, playerEnderChestContainer);
 +                            } else if (bukkitPlayer.hasPermission("purpur.enderchest.rows.one")) {
++                                player.sixRowEnderchestSlotCount = 9;
 +                                return ChestMenu.oneRow(syncId, inventory, playerEnderChestContainer);
 +                            }
 +                        }
++                        player.sixRowEnderchestSlotCount = -1;
 +                        return ChestMenu.sixRows(syncId, inventory, playerEnderChestContainer);
 +                    }
 +                    // Purpur end