@@ -5,10 +5,10 @@ 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 2d09f2a2c97f29ac0d941b7a3fb941102a5d545e..94abb9d8f6381aee000dbd0720477db8b7ca279c 100644
8+ index ccea424d813a4c137fa15612b7bcf4fdb5c9a811..a1304bc3b1ebb9fa246004ae418481d48c46975c 100644
99--- a/net/minecraft/server/players/PlayerList.java
1010+++ b/net/minecraft/server/players/PlayerList.java
11- @@ -1027 ,6 +1027 ,27 @@ public abstract class PlayerList {
11+ @@ -1029 ,6 +1029 ,27 @@ public abstract class PlayerList {
1212 player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
1313 this.server.getCommands().sendCommands(player);
1414 } // Paper - Add sendOpLevel API
@@ -37,10 +37,10 @@ index 2d09f2a2c97f29ac0d941b7a3fb941102a5d545e..94abb9d8f6381aee000dbd0720477db8
3737
3838 public boolean isWhiteListed(GameProfile profile) {
3939diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
40- index d0321875d2a2b612b438cc7973a7e9f172a61778..15308ff3ed5835e3b8f41e7ddc2045f424e14660 100644
40+ index 2417c26a03decf756ad93cd54265277c95c653ca..87c8bc6f9128d2fcb19628bc3ef354e517b632bb 100644
4141--- a/net/minecraft/world/entity/player/Player.java
4242+++ b/net/minecraft/world/entity/player/Player.java
43- @@ -202 ,6 +202 ,7 @@ public abstract class Player extends LivingEntity {
43+ @@ -212 ,6 +212 ,7 @@ public abstract class Player extends LivingEntity {
4444 public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; // Paper - flying fall damage
4545 public int burpDelay = 0; // Purpur - Burp delay
4646 public boolean canPortalInstant = false; // Purpur - Add portal permission bypass
@@ -49,7 +49,7 @@ index d0321875d2a2b612b438cc7973a7e9f172a61778..15308ff3ed5835e3b8f41e7ddc2045f4
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 280169afbd637eeb67ddf7eaeb4eecd464a128d5..ba7730a24831efa33de4c5ffce57bfa7177f89d6 100644
52+ index 0fffa384f928ab84451331380968fb4650eafe26..0399092c9f7a43ac100c11505176ade6d95a39da 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 {
@@ -84,7 +84,7 @@ index 280169afbd637eeb67ddf7eaeb4eecd464a128d5..ba7730a24831efa33de4c5ffce57bfa7
8484 return new ChestMenu(MenuType.GENERIC_9x6, containerId, playerInventory, container, 6);
8585 }
8686diff --git a/net/minecraft/world/inventory/PlayerEnderChestContainer.java b/net/minecraft/world/inventory/PlayerEnderChestContainer.java
87- index a6a359bab2a727f4631b633a8bb370dd40decc75..d2d75e5c34c97300ce5da8c7ea70958aba31fa4a 100644
87+ index bc2b95973192069fc64581b59583b19df876f55d..b68d57eee9605dba8ecd31f82185ec3ea81d60c1 100644
8888--- a/net/minecraft/world/inventory/PlayerEnderChestContainer.java
8989+++ b/net/minecraft/world/inventory/PlayerEnderChestContainer.java
9090@@ -25,11 +25,18 @@ public class PlayerEnderChestContainer extends SimpleContainer {
@@ -108,7 +108,7 @@ index a6a359bab2a727f4631b633a8bb370dd40decc75..d2d75e5c34c97300ce5da8c7ea70958a
108108 this.activeChest = enderChestBlockEntity;
109109 }
110110diff --git a/net/minecraft/world/level/block/EnderChestBlock.java b/net/minecraft/world/level/block/EnderChestBlock.java
111- index f5533960708bdbaf2eacefbc7c7c3123b7d26502..17aa27885b4431bf7b98799e02d080b5a0ecbbf1 100644
111+ index 5077a9ff7b78801bdc53536a37aee07b8d86ee4d..72794e204f7fcc31ece94913b7fd9f36ae022b10 100644
112112--- a/net/minecraft/world/level/block/EnderChestBlock.java
113113+++ b/net/minecraft/world/level/block/EnderChestBlock.java
114114@@ -85,8 +85,8 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
@@ -159,13 +159,13 @@ index f5533960708bdbaf2eacefbc7c7c3123b7d26502..17aa27885b4431bf7b98799e02d080b5
159159 public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
160160 return new EnderChestBlockEntity(pos, state);
161161diff --git a/net/minecraft/world/level/block/entity/BarrelBlockEntity.java b/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
162- index 0f808855f58281578c2758513787f0f7330c9291..9f6063089f0aa3a68d26ae7cfe39379123ab2f47 100644
162+ index 027502d0af5512c31878978c4d05c52fa3029cca..f5216355ef13593bc7333d50a003012e25b3d7ea 100644
163163--- a/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
164164+++ b/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
165- @@ -55,7 +55,17 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
166- this.maxStack = i;
165+ @@ -56,7 +56,17 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
167166 }
168167 // CraftBukkit end
168+
169169- private NonNullList<ItemStack> items = NonNullList.withSize(27, ItemStack.EMPTY);
170170+ // Purpur start - Barrels and enderchests 6 rows
171171+ private NonNullList<ItemStack> items = NonNullList.withSize(switch (org.purpurmc.purpur.PurpurConfig.barrelRows) {
@@ -181,7 +181,7 @@ index 0f808855f58281578c2758513787f0f7330c9291..9f6063089f0aa3a68d26ae7cfe393791
181181 public final ContainerOpenersCounter openersCounter = new ContainerOpenersCounter() {
182182 @Override
183183 protected void onOpen(Level level, BlockPos pos, BlockState state) {
184- @@ -107 ,7 +117 ,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
184+ @@ -108 ,7 +118 ,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
185185
186186 @Override
187187 public int getContainerSize() {
@@ -199,7 +199,7 @@ index 0f808855f58281578c2758513787f0f7330c9291..9f6063089f0aa3a68d26ae7cfe393791
199199 }
200200
201201 @Override
202- @@ -127 ,7 +146 ,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
202+ @@ -128 ,7 +147 ,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
203203
204204 @Override
205205 protected AbstractContainerMenu createMenu(int id, Inventory player) {
0 commit comments