diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst index 5f54a5da6..ce34090ed 100644 --- a/docs/source/configuration.rst +++ b/docs/source/configuration.rst @@ -43,6 +43,11 @@ enable-tps-catchup * **default**: false * **description**: Enable/disable Spigot's TPS catchup (makes everything tick faster than 20 tps after lag spikes, which can cause more lag - also skews /tps reports by ruining the average with above 20 tps entries) +packed-barrels +~~~~~~~~~~~~~~ +* **default**: true +* **description:** Use large size barrels (6 rows, aka 54 slots) + logger ~~~~~~ * show-duplicate-entity-uuid-errors diff --git a/patches/server/0021-Packed-Barrels.patch b/patches/server/0021-Packed-Barrels.patch new file mode 100644 index 000000000..860d02bd0 --- /dev/null +++ b/patches/server/0021-Packed-Barrels.patch @@ -0,0 +1,57 @@ +From 74a04d1c627d29a24f0bcda519b6bd31e7674b6e Mon Sep 17 00:00:00 2001 +From: William Blake Galbreath +Date: Thu, 23 May 2019 21:50:37 -0500 +Subject: [PATCH] Packed Barrels + +--- + src/main/java/net/minecraft/server/TileEntityBarrel.java | 5 +++-- + src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++ + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/main/java/net/minecraft/server/TileEntityBarrel.java b/src/main/java/net/minecraft/server/TileEntityBarrel.java +index a4a5150ff..007d0cda5 100644 +--- a/src/main/java/net/minecraft/server/TileEntityBarrel.java ++++ b/src/main/java/net/minecraft/server/TileEntityBarrel.java +@@ -56,7 +56,7 @@ public class TileEntityBarrel extends TileEntityLootable { + + private TileEntityBarrel(TileEntityTypes tileentitytypes) { + super(tileentitytypes); +- this.items = NonNullList.a(27, ItemStack.a); ++ this.items = NonNullList.a(net.pl3x.purpur.PurpurConfig.packedBarrels ? 54 : 27, ItemStack.a); // Purpur + } + + public TileEntityBarrel() { +@@ -85,7 +85,7 @@ public class TileEntityBarrel extends TileEntityLootable { + + @Override + public int getSize() { +- return 27; ++ return net.pl3x.purpur.PurpurConfig.packedBarrels ? 54 : 27; // Purpur + } + + @Override +@@ -151,6 +151,7 @@ public class TileEntityBarrel extends TileEntityLootable { + + @Override + protected Container createContainer(int i, PlayerInventory playerinventory) { ++ if (net.pl3x.purpur.PurpurConfig.packedBarrels) return ContainerChest.b(i, playerinventory, this); // Purpur + return ContainerChest.a(i, playerinventory, this); + } + +diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +index a23f5d798..608e1f5e2 100644 +--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java ++++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +@@ -135,4 +135,9 @@ public class PurpurConfig { + snowmanDropsPumpkin = getBoolean("settings.mobs.snow_golem.drops-pumpkin-when-sheared", snowmanDropsPumpkin); + snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack); + } ++ ++ public static boolean packedBarrels = true; ++ private static void packedBarrels() { ++ packedBarrels = getBoolean("packed-barrels", packedBarrels); ++ } + } +-- +2.20.1 +