@@ -5,7 +5,7 @@ Subject: [PATCH] Barrels and enderchests 6 rows
55
66
77diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
8- index 3e18c6ca8f5a732a110277f817a3e8dcd742f193..b471145ff65e07c39689e466387715698b55481e 100644
8+ index 98dfad445940d400270740df17cc04849b90db94..331c7815552f2aa626eb5a1386d1769c4fad063f 100644
99--- a/net/minecraft/server/players/PlayerList.java
1010+++ b/net/minecraft/server/players/PlayerList.java
1111@@ -886,6 +886,27 @@ public abstract class PlayerList {
@@ -37,7 +37,7 @@ index 3e18c6ca8f5a732a110277f817a3e8dcd742f193..b471145ff65e07c39689e46638771569
3737
3838 // Paper start - whitelist verify event / login event
3939diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
40- index def90b5105edb0303eecc4424ff7d6e2cb050791..99db58c431252f87eda5d741b54a5e4e87addae5 100644
40+ index c12d88851552a5ac0b4c2e9c19d049e0a52dc578..79f0bbfcf8ccdcbee99042d15adb5eb2338da124 100644
4141--- a/net/minecraft/world/entity/player/Player.java
4242+++ b/net/minecraft/world/entity/player/Player.java
4343@@ -176,6 +176,7 @@ public abstract class Player extends Avatar implements ContainerUser {
@@ -49,20 +49,20 @@ index def90b5105edb0303eecc4424ff7d6e2cb050791..99db58c431252f87eda5d741b54a5e4e
4949 // CraftBukkit start
5050 public boolean fauxSleeping;
5151diff --git a/net/minecraft/world/inventory/ChestMenu.java b/net/minecraft/world/inventory/ChestMenu.java
52- index e77bfcd31cdcfd5836dc5db561e3fe2bc552a4b1..afa2ead0548766669201526d83f351c227c97e87 100644
52+ index e77bfcd31cdcfd5836dc5db561e3fe2bc552a4b1..2a2e0cc455b0077758ca0d6c20465a79853247d4 100644
5353--- a/net/minecraft/world/inventory/ChestMenu.java
5454+++ b/net/minecraft/world/inventory/ChestMenu.java
5555@@ -66,10 +66,30 @@ public class ChestMenu extends AbstractContainerMenu {
5656 return new ChestMenu(MenuType.GENERIC_9x6, containerId, inventory, 6);
5757 }
5858
5959+ // Purpur start - Barrels and enderchests 6 rows
60- + public static ChestMenu oneRow(int syncId, Inventory playerInventory, Container inventory ) {
61- + return new ChestMenu(MenuType.GENERIC_9x1, syncId, playerInventory, inventory , 1);
60+ + public static ChestMenu oneRow(final int containerId, final Inventory inventory, final Container container ) {
61+ + return new ChestMenu(MenuType.GENERIC_9x1, containerId, inventory, container , 1);
6262+ }
6363+
64- + public static ChestMenu twoRows(int syncId, Inventory playerInventory, Container inventory ) {
65- + return new ChestMenu(MenuType.GENERIC_9x2, syncId, playerInventory, inventory , 2);
64+ + public static ChestMenu twoRows(final int containerId, final Inventory inventory, final Container container ) {
65+ + return new ChestMenu(MenuType.GENERIC_9x2, containerId, inventory, container , 2);
6666+ }
6767+ // Purpur end - Barrels and enderchests 6 rows
6868+
@@ -71,12 +71,12 @@ index e77bfcd31cdcfd5836dc5db561e3fe2bc552a4b1..afa2ead0548766669201526d83f351c2
7171 }
7272
7373+ // Purpur start - Barrels and enderchests 6 rows
74- + public static ChestMenu fourRows(int syncId, Inventory playerInventory, Container inventory ) {
75- + return new ChestMenu(MenuType.GENERIC_9x4, syncId, playerInventory, inventory , 4);
74+ + public static ChestMenu fourRows(final int containerId, final Inventory inventory, final Container container ) {
75+ + return new ChestMenu(MenuType.GENERIC_9x4, containerId, inventory, container , 4);
7676+ }
7777+
78- + public static ChestMenu fiveRows(int syncId, Inventory playerInventory, Container inventory ) {
79- + return new ChestMenu(MenuType.GENERIC_9x5, syncId, playerInventory, inventory , 5);
78+ + public static ChestMenu fiveRows(final int containerId, final Inventory inventory, final Container container ) {
79+ + return new ChestMenu(MenuType.GENERIC_9x5, containerId, inventory, container , 5);
8080+ }
8181+ // Purpur end - Barrels and enderchests 6 rows
8282+
@@ -186,7 +186,7 @@ index f1a5b9670dd04b800a8d755f32364458a16d924a..899f422494396dd0b797c03de209e7a2
186186 public BlockEntity newBlockEntity(final BlockPos worldPosition, final BlockState blockState) {
187187 return new EnderChestBlockEntity(worldPosition, blockState);
188188diff --git a/net/minecraft/world/level/block/entity/BarrelBlockEntity.java b/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
189- index 5bfd25f22808794f5e24d5425ea32e8c1b927182..e489da795bfc3f6fded36608761068ba7f333e4b 100644
189+ index 118af4e35eec652e7eb8a484a44652cfabc1bab5..695ded41914d2614b869cee9b0a51a41381b1f39 100644
190190--- a/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
191191+++ b/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
192192@@ -59,7 +59,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
0 commit comments