Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: 9b0a0d8 Add the default tick rate of the sensor to the timings (#6242) e905eb1 Add fireball to default max load config (#6252) 2f1f1b7 Add config option to specify timings url (#6256) efd7e51 Move "use-display-name-in-quit-message" to settings namespace (#6257) b32a3b1 Call EntityKnockbackByEntityEvent for RamTarget Behavior (#6273)
2026-02-17 16:37:43 +01:00 · 2021-07-26 21:41:58 -05:00
parent f482d19d56
commit b2056c256f
28 changed files with 100 additions and 89 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
 mcVersion = 1.17.1
 packageVersion = 1_17_R1

-paperCommit = 9a0263e2ac2a4bd52274c836b6ee70f064acef74
+paperCommit = b32a3b147cba623c87f4b72bcaa2aa4d2b4e165d

 org.gradle.parallel = true
 org.gradle.vfs.watch = false
--- a/patches/server/0003-Purpur-config-files.patch
+++ b/patches/server/0003-Purpur-config-files.patch
@@ -29,7 +29,7 @@ index 3918b24c98faa5232c7ffd733ba8000562132785..4d8740678049aa749b42618470e9cc83
                 metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                     Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f101302892a7f95ffa0e6d63cb69d8a3ddbd67a7..a8d99549afbfbb0cbb45dd9dc278315e5ae5ea9d 100644
+index 95d8cf449bf0439fddaf319246fef51e1570b68e..3828337aac9fd7c0a982184cfe9c61888fa544c0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -118,6 +118,11 @@ public class PaperConfig {
@@ -123,7 +123,7 @@ index 61a4dea715689b0ce9247040db5dd2080ee2e167..ffe76b8afd2a2c3153751c73ee7bbf4c
         this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..d0d87fcca78ea5c7853d693bc617c2bd6cfed487
+index 0000000000000000000000000000000000000000..faa4ad6af45ce1ef62084194340c6789634bff5f
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -0,0 +1,159 @@
@@ -190,8 +190,8 @@ index 0000000000000000000000000000000000000000..d0d87fcca78ea5c7853d693bc617c2bd
 +        commands = new HashMap<>();
 +        commands.put("purpur", new PurpurCommand("purpur"));
 +
-+        version = getInt("config-version", 17);
-+        set("config-version", 17);
+        version = getInt("config-version", 18);
+        set("config-version", 18);
 +
 +        readConfig(PurpurConfig.class, null);
 +    }
--- a/patches/server/0007-Timings-stuff.patch
+++ b/patches/server/0007-Timings-stuff.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Timings stuff


 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 9d920565ff65a84b1b9a2a4777fd8bc8f07e0153..69d85e5a0a5ab9ffb682d8565aa08a4a567b68da 100644
+index b5728243f01aa6ea75cb42af453fd9348a5f438b..7b5d81be9f4a55fc7e163359aa6d8b265a538610 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -226,10 +226,14 @@ public class TimingsExport extends Thread {
@@ -45,27 +45,38 @@ index 9d920565ff65a84b1b9a2a4777fd8bc8f07e0153..69d85e5a0a5ab9ffb682d8565aa08a4a
     private static JSONObject mapAsJSON(ConfigurationSection config, String parentKey) {
 
         JSONObject object = new JSONObject();
-@@ -306,7 +323,7 @@ public class TimingsExport extends Thread {
-         String response = null;
-         String timingsURL = null;
-         try {
-            HttpURLConnection con = (HttpURLConnection) new URL("http://timings.aikar.co/post").openConnection();
-+            HttpURLConnection con = (HttpURLConnection) new URL(net.pl3x.purpur.PurpurConfig.timingsUrl + "/post").openConnection(); // Purpur
-             con.setDoOutput(true);
-             String hostName = "BrokenHost";
-             try {
+diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
+index 3828337aac9fd7c0a982184cfe9c61888fa544c0..d2046a6a9c5fe293d5f24138262517e77e64b303 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
+@@ -208,7 +208,7 @@ public class PaperConfig {
+     private static void timings() {
+         boolean timings = getBoolean("timings.enabled", true);
+         boolean verboseTimings = getBoolean("timings.verbose", true);
+-        TimingsManager.url = getString("timings.url", "https://timings.aikar.co/");
+        TimingsManager.url = getString("timings.url", "https://timings.pl3x.net/");
+         if (!TimingsManager.url.endsWith("/")) {
+             TimingsManager.url += "/";
+         }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 773e42ff93e01b9f2db41dc4e8273525c5c162dc..9949089f700a402ba5a6e79bf1a9a637d69444e9 100644
+index ad7dbfa8dd5f38af87ec8980fd972ea4449da7ed..7e1938263ecb02c7d2a1fc3dff7aa35b958c6113 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -161,4 +161,10 @@ public class PurpurConfig {
+@@ -161,4 +161,17 @@ public class PurpurConfig {
     private static void messages() {
         cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
     }
 +
-+    public static String timingsUrl = "https://timings.pl3x.net";
 +    private static void timingsSettings() {
-+        timingsUrl = getString("settings.timings.url", timingsUrl);
+        if (version < 18) {
+            String oldVal = getString("settings.timings.url", "https://timings.pl3x.net");
+            com.destroystokyo.paper.PaperConfig.config.set("timings.url", oldVal);
+            TimingsManager.url = getString("timings.url", oldVal);
+            if (!TimingsManager.url.endsWith("/")) {
+                TimingsManager.url += "/";
+            }
+            set("settings.timings.url", null);
+        }
 +        if (!co.aikar.timings.TimingsManager.hiddenConfigs.contains("server-ip")) co.aikar.timings.TimingsManager.hiddenConfigs.add("server-ip");
 +    }
 }
--- a/patches/server/0008-Barrels-and-enderchests-6-rows.patch
+++ b/patches/server/0008-Barrels-and-enderchests-6-rows.patch
@@ -142,11 +142,11 @@ index f494063ead9c6303fb3ca880aba2a877ae8d83ab..3b027111ed933856ae86ad5f62aac744
     }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 9949089f700a402ba5a6e79bf1a9a637d69444e9..b0180b1a8ecfd14cb5b95de0145f88dc7354928b 100644
+index 7e1938263ecb02c7d2a1fc3dff7aa35b958c6113..d7ed125553530e28644f5fb9c09f7a06eb79199a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -167,4 +167,23 @@ public class PurpurConfig {
-         timingsUrl = getString("settings.timings.url", timingsUrl);
+@@ -174,4 +174,23 @@ public class PurpurConfig {
+         }
         if (!co.aikar.timings.TimingsManager.hiddenConfigs.contains("server-ip")) co.aikar.timings.TimingsManager.hiddenConfigs.add("server-ip");
     }
 +
--- a/patches/server/0011-AFK-API.patch
+++ b/patches/server/0011-AFK-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] AFK API


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index bd787b4122502eacacadd8d47ea5aa5dc5e023e5..22366098d0a3f6df2ba650ef01ed4be77bee0496 100644
+index ac44d1c07ba6922d25592d750af326d34b625cec..0b0f4c1c53a575144206db9690855595c4f7003c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1948,8 +1948,58 @@ public class ServerPlayer extends Player {
@@ -68,7 +68,7 @@ index bd787b4122502eacacadd8d47ea5aa5dc5e023e5..22366098d0a3f6df2ba650ef01ed4be7
         return this.stats;
     }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e43239fd04e81b3653c07cc441be1a4036b96b97..8414826f6f9204bdda832efcb00e24ab0115bd59 100644
+index 757c9f9800de18ca8ece3583222c7d3a765f3bde..65fb15671ed2947bc62753bc685656732a96feff 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -390,6 +390,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -177,7 +177,7 @@ index 6a4e44dd8935018d1b5283761dfb8e855be62987..afe70b0d5bd98d05bbb7afc756108f09
                 if (range < 0.0D || d < range * range) {
                     return true;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index b0180b1a8ecfd14cb5b95de0145f88dc7354928b..b36ea5fc2259d0d8a5302b9f60172cfea7b89e11 100644
+index d7ed125553530e28644f5fb9c09f7a06eb79199a..439143a24ad57cf749544164fe3cd131df78ea01 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -158,8 +158,16 @@ public class PurpurConfig {
@@ -196,7 +196,7 @@ index b0180b1a8ecfd14cb5b95de0145f88dc7354928b..b36ea5fc2259d0d8a5302b9f60172cfe
 +        afkTabListSuffix = getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix);
     }
 
-     public static String timingsUrl = "https://timings.pl3x.net";
+     private static void timingsSettings() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 index 3627b50dd3af5da225004cd3f8158fcbd30d8ea3..dc3dcf7946d2b31784b31d31c01670b81e626eed 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -220,7 +220,7 @@ index 3627b50dd3af5da225004cd3f8158fcbd30d8ea3..dc3dcf7946d2b31784b31d31c01670b8
     public boolean untamedTamablesAreRidable = true;
     public boolean useNightVisionWhenRiding = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 538beaedac3f8fe85fe5125cce1043706a295f89..d18a46745a82a758a3709ffa1de4b81bf4b75766 100644
+index 5038bd2d0920ffc37a33d0c971cf28c330e58e06..5c9aa0e2e5a9e6a671fdc8d51f94529736b6dbbf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -424,10 +424,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
--- a/patches/server/0013-Configurable-server-mod-name.patch
+++ b/patches/server/0013-Configurable-server-mod-name.patch
@@ -18,7 +18,7 @@ index 2ede76a55c72840d915ed282609b1ca14f549929..7d1c39fec406aca69705db055b6d8f85
 
     public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index b36ea5fc2259d0d8a5302b9f60172cfea7b89e11..96e4e31cc3718ded522006b8dd8e9e36b6b2e74d 100644
+index 439143a24ad57cf749544164fe3cd131df78ea01..9577355817a71b2e398ccf411cbcfd3a77bfafaf 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -170,6 +170,11 @@ public class PurpurConfig {
@@ -30,6 +30,6 @@ index b36ea5fc2259d0d8a5302b9f60172cfea7b89e11..96e4e31cc3718ded522006b8dd8e9e36
 +        serverModName = getString("settings.server-mod-name", serverModName);
 +    }
 +
-     public static String timingsUrl = "https://timings.pl3x.net";
     private static void timingsSettings() {
-         timingsUrl = getString("settings.timings.url", timingsUrl);
+         if (version < 18) {
+             String oldVal = getString("settings.timings.url", "https://timings.pl3x.net");
--- a/patches/server/0015-Lagging-threshold.patch
+++ b/patches/server/0015-Lagging-threshold.patch
@@ -25,10 +25,10 @@ index 7d1c39fec406aca69705db055b6d8f859142c986..53d429eec63448f5e30ffb7026d49579
                     }
                     // Tuinity - replace logic
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 96e4e31cc3718ded522006b8dd8e9e36b6b2e74d..e027b5a2d0cc094c0cac2c1ca16e3d9693374384 100644
+index 9577355817a71b2e398ccf411cbcfd3a77bfafaf..dd9fca23e1f96ad261589d9b66d4306a228ec76a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -181,6 +181,11 @@ public class PurpurConfig {
+@@ -188,6 +188,11 @@ public class PurpurConfig {
         if (!co.aikar.timings.TimingsManager.hiddenConfigs.contains("server-ip")) co.aikar.timings.TimingsManager.hiddenConfigs.add("server-ip");
     }
 
--- a/patches/server/0022-Alternative-Keepalive-Handling.patch
+++ b/patches/server/0022-Alternative-Keepalive-Handling.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Alternative Keepalive Handling


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3bd3cb3011e95f5c8123209e37034d7e4224fd47..b9fc450c548e20d1f9763d993f3818235bec4bdb 100644
+index 858a0402a22e3c52d88b976bb513d0f82a60d114..4bc387482dfcecea079257e65e933ecd78951adc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -228,6 +228,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -56,10 +56,10 @@ index 3bd3cb3011e95f5c8123209e37034d7e4224fd47..b9fc450c548e20d1f9763d993f381823
         if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
             int i = (int) (Util.getMillis() - this.keepAliveTime);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index e027b5a2d0cc094c0cac2c1ca16e3d9693374384..403c996c44b9afbc4236966940f39ca51a476e3d 100644
+index dd9fca23e1f96ad261589d9b66d4306a228ec76a..2175b355c9c05bec3cac9d9f392a4992261ff63e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -186,6 +186,11 @@ public class PurpurConfig {
+@@ -193,6 +193,11 @@ public class PurpurConfig {
         laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
     }
 
--- a/patches/server/0026-Logger-settings-suppressing-pointless-logs.patch
+++ b/patches/server/0026-Logger-settings-suppressing-pointless-logs.patch
@@ -17,10 +17,10 @@ index 7d6dc0a8ee35274052b122bbc446bc54750de0a6..c46df052a5a39d92688f51377ee1f7b5
                             }
                             // CraftBukkit end
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 403c996c44b9afbc4236966940f39ca51a476e3d..0f94bcb6e728f4ad365ed5a51d7562182ad1031d 100644
+index 2175b355c9c05bec3cac9d9f392a4992261ff63e..ce0648631f5a63d4872e04f6615ca097be5f3d17 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -209,4 +209,11 @@ public class PurpurConfig {
+@@ -216,4 +216,11 @@ public class PurpurConfig {
         org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
         enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
     }
--- a/patches/server/0033-Dont-send-useless-entity-packets.patch
+++ b/patches/server/0033-Dont-send-useless-entity-packets.patch
@@ -40,10 +40,10 @@ index 0fcd6a9162f5bddb3c4fc42b3a64efde7c7d9a9b..b7116c40b22c4c614ba74232a18c216d
         this.entity.stopSeenByPlayer(player);
         player.connection.send(new ClientboundRemoveEntitiesPacket(new int[]{this.entity.getId()}));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 0f94bcb6e728f4ad365ed5a51d7562182ad1031d..f01f3628894a9491ef03c662feee49ccdf871519 100644
+index ce0648631f5a63d4872e04f6615ca097be5f3d17..cc1b102949e9236b8b7960e76f712348c9e02022 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -210,6 +210,11 @@ public class PurpurConfig {
+@@ -217,6 +217,11 @@ public class PurpurConfig {
         enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
     }
 
--- a/patches/server/0055-Configurable-TPS-Catchup.patch
+++ b/patches/server/0055-Configurable-TPS-Catchup.patch
@@ -24,10 +24,10 @@ index 53d429eec63448f5e30ffb7026d49579264bd705..c96feac8afa0e0ea05513692d1e937ae
                     this.profiler.pop();
                     this.endMetricsRecordingTick();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index f01f3628894a9491ef03c662feee49ccdf871519..66745b2c1c38391779abb496933c74466379aef2 100644
+index cc1b102949e9236b8b7960e76f712348c9e02022..03b88ddc349fc7cfa48573ec93c22cd9cef3b58d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -221,4 +221,9 @@ public class PurpurConfig {
+@@ -228,4 +228,9 @@ public class PurpurConfig {
         loggerSuppressInitLegacyMaterialError = getBoolean("settings.logger.suppress-init-legacy-material-errors", loggerSuppressInitLegacyMaterialError);
         loggerSuppressIgnoredAdvancementWarnings = getBoolean("settings.logger.suppress-ignored-advancement-warnings", loggerSuppressIgnoredAdvancementWarnings);
     }
--- a/patches/server/0080-Add-allow-water-in-end-world-option.patch
+++ b/patches/server/0080-Add-allow-water-in-end-world-option.patch
@@ -68,10 +68,10 @@ index df4f2c729f09d5229553308e4876f29de648543f..f2b0278679fa649bbc2904660e0dc9ab
         } else {
             world.setBlockAndUpdate(pos, Blocks.WATER.defaultBlockState());
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 4950ade071fb401326aeb4075f5a2a5ab65d4d52..86f4f92ee15fa2320da0a75bb515e711315aa3a9 100644
+index 35be2f773d33b1c13f8732217c5520b384305b18..3bfddb1111f543a5badb26ca52b4dcef32a7cf1a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -221,6 +221,11 @@ public class PurpurConfig {
+@@ -228,6 +228,11 @@ public class PurpurConfig {
         dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
     }
 
--- a/patches/server/0091-Add-option-to-disable-certain-block-updates.patch
+++ b/patches/server/0091-Add-option-to-disable-certain-block-updates.patch
@@ -117,10 +117,10 @@ index f8e58d9f71703139a736d93e7f1996e027a29444..d3c8fd8399629efb8bcbaf7d9a0c4334
     }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 85f323b2b1be900ee1d7416b5dd9877bbb282460..7e1b039569888c00125dd2a99c066556f3482329 100644
+index f8aeba21a04bcf3cc6c63bcf99ea3b5c2773741a..73b0bbc63606475bf27e665b7b280cdfed05d31a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -348,6 +348,15 @@ public class PurpurConfig {
+@@ -355,6 +355,15 @@ public class PurpurConfig {
         allowWaterPlacementInTheEnd = getBoolean("settings.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd);
     }
 
--- a/patches/server/0096-Short-enderman-height.patch
+++ b/patches/server/0096-Short-enderman-height.patch
@@ -31,10 +31,10 @@ index 6e0b5fbf5b0d216b6b7c647d45ef37cd6b591717..5ebedd6a156b06e98aded57c817f6342
             if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
             for (int i = 0; i < 64; ++i) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 7e1b039569888c00125dd2a99c066556f3482329..d762ef0e90a519528f3dd48b0587f57888deff64 100644
+index 73b0bbc63606475bf27e665b7b280cdfed05d31a..05d4f65c5c0de043add313675357d96aa585aa47 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -338,6 +338,12 @@ public class PurpurConfig {
+@@ -345,6 +345,12 @@ public class PurpurConfig {
         enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
     }
 
--- a/patches/server/0099-Crying-obsidian-valid-for-portal-frames.patch
+++ b/patches/server/0099-Crying-obsidian-valid-for-portal-frames.patch
@@ -18,10 +18,10 @@ index c07b5d1f1ef8b5e6026c7555d476880c8802d6c5..068f1b184a3694603f564d49fa45d5ce
     private final LevelAccessor level;
     private final Direction.Axis axis;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index d762ef0e90a519528f3dd48b0587f57888deff64..208324d9a197eb763f4f5d08e60f0ca23066a7e1 100644
+index 05d4f65c5c0de043add313675357d96aa585aa47..c055119e839c24a2de1cd399c7ab6a57281be41b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -322,6 +322,7 @@ public class PurpurConfig {
+@@ -329,6 +329,7 @@ public class PurpurConfig {
     public static boolean barrelSixRows = false;
     public static boolean enderChestSixRows = false;
     public static boolean enderChestPermissionRows = false;
@@ -29,7 +29,7 @@ index d762ef0e90a519528f3dd48b0587f57888deff64..208324d9a197eb763f4f5d08e60f0ca2
     private static void blockSettings() {
         if (version < 3) {
             boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -336,6 +337,7 @@ public class PurpurConfig {
+@@ -343,6 +344,7 @@ public class PurpurConfig {
         enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestSixRows);
         org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
         enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
--- a/patches/server/0113-Allow-infinite-and-mending-enchantments-together.patch
+++ b/patches/server/0113-Allow-infinite-and-mending-enchantments-together.patch
@@ -17,10 +17,10 @@ index 3aece8245060dd1ba269c08d226c84247a6f0a83..6763d0b96c83d1b462999f525bf1f31c
     }
 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 208324d9a197eb763f4f5d08e60f0ca23066a7e1..16d48e442396be56996ebf64fd8a299122b56544 100644
+index c055119e839c24a2de1cd399c7ab6a57281be41b..731c85911c3d763d06f9f6a602f93e33eeadf3f6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -340,6 +340,16 @@ public class PurpurConfig {
+@@ -347,6 +347,16 @@ public class PurpurConfig {
         cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
     }
 
--- a/patches/server/0132-EMC-Configurable-disable-give-dropping.patch
+++ b/patches/server/0132-EMC-Configurable-disable-give-dropping.patch
@@ -20,10 +20,10 @@ index a0dc380e90415de9068ea408d62a1605c82631df..60fd566f7e1499ecf2ad91216a667f12
                         itemStack.setCount(1);
                         ItemEntity itemEntity2 = serverPlayer.drop(itemStack, false, false, true); // Paper - Fix duplicating /give items on item drop cancel
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 16d48e442396be56996ebf64fd8a299122b56544..e1701ab4bd6eccb9a525fa3eb8b35a1bf6f7ffcd 100644
+index 731c85911c3d763d06f9f6a602f93e33eeadf3f6..ad4908c00ea98ea26aa211436c572b4ec04cd030 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -319,6 +319,11 @@ public class PurpurConfig {
+@@ -326,6 +326,11 @@ public class PurpurConfig {
         useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
     }
 
--- a/patches/server/0141-Implement-TPSBar.patch
+++ b/patches/server/0141-Implement-TPSBar.patch
@@ -105,10 +105,10 @@ index 29043f9354b29f7766f1d6d8e793e2ea23883fa0..9a0065bd8eeb758daeb49d82ba8f2c09
 
         entityplayer.awardStat(Stats.LEAVE_GAME);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index e1701ab4bd6eccb9a525fa3eb8b35a1bf6f7ffcd..7ed1d5b2aab3442f80532c62a398353e89c18b0c 100644
+index ad4908c00ea98ea26aa211436c572b4ec04cd030..da4d5b05cf2daa31ecd70d2815017bbb6e771313 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -324,6 +324,29 @@ public class PurpurConfig {
+@@ -331,6 +331,29 @@ public class PurpurConfig {
         disableGiveCommandDrops = getBoolean("settings.disable-give-dropping", disableGiveCommandDrops);
     }
 
--- a/patches/server/0174-Allow-infinity-on-crossbows.patch
+++ b/patches/server/0174-Allow-infinity-on-crossbows.patch
@@ -59,10 +59,10 @@ index 6f6106ca4d74d50a7b74b086adc96c58c7906cb6..d6417c1e77ac8823e18a179dc9f61757
 
     public abstract boolean canEnchant(Item item);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 45d536954b8007de69c6f74942c2293510739a5e..f53c2c9a62554141d4f951e5a1c25376e7eaf299 100644
+index ccd228aa323eef108526640dfe03b07541041236..80fc65c5f3a89241fb7aadaccbf730a5f05dec64 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -371,6 +371,7 @@ public class PurpurConfig {
+@@ -378,6 +378,7 @@ public class PurpurConfig {
     }
 
     public static boolean allowInfinityMending = false;
@@ -70,7 +70,7 @@ index 45d536954b8007de69c6f74942c2293510739a5e..f53c2c9a62554141d4f951e5a1c25376
     private static void enchantmentSettings() {
         if (version < 5) {
             boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false);
-@@ -378,6 +379,7 @@ public class PurpurConfig {
+@@ -385,6 +386,7 @@ public class PurpurConfig {
             set("settings.enchantment.allow-infinite-and-mending-together", null);
         }
         allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);
--- a/patches/server/0180-Config-to-allow-for-unsafe-enchants.patch
+++ b/patches/server/0180-Config-to-allow-for-unsafe-enchants.patch
@@ -75,10 +75,10 @@ index 1ecc0b740758c878a5a196524fbaa238b6689ac5..b3b5b75e3df805027c5daa98d7fc1d4d
         this.getOrCreateTag().put(key, tag);
     }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index f53c2c9a62554141d4f951e5a1c25376e7eaf299..de340a9c0abdc8bc2cbdc71f1858a9ddd549aa94 100644
+index 80fc65c5f3a89241fb7aadaccbf730a5f05dec64..01330b33775a340237df6175c208162cec0379d6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -372,6 +372,7 @@ public class PurpurConfig {
+@@ -379,6 +379,7 @@ public class PurpurConfig {
 
     public static boolean allowInfinityMending = false;
     public static boolean allowCrossbowInfinity = false;
@@ -86,7 +86,7 @@ index f53c2c9a62554141d4f951e5a1c25376e7eaf299..de340a9c0abdc8bc2cbdc71f1858a9dd
     private static void enchantmentSettings() {
         if (version < 5) {
             boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false);
-@@ -380,6 +381,7 @@ public class PurpurConfig {
+@@ -387,6 +388,7 @@ public class PurpurConfig {
         }
         allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);
         allowCrossbowInfinity = getBoolean("settings.enchantment.allow-infinity-on-crossbow", allowCrossbowInfinity);
--- a/patches/server/0185-Config-to-change-max-number-of-bees.patch
+++ b/patches/server/0185-Config-to-change-max-number-of-bees.patch
@@ -18,10 +18,10 @@ index 8484e80a70129fb0358d56efab6fd54798b54e6e..ffacc4b8cc3ab8285c4131aec58e48ff
     public BeehiveBlockEntity(BlockPos pos, BlockState state) {
         super(BlockEntityType.BEEHIVE, pos, state);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index de340a9c0abdc8bc2cbdc71f1858a9ddd549aa94..d3f6ced425cca6e80eca485c6007691404c5785b 100644
+index 01330b33775a340237df6175c208162cec0379d6..14e732da4c80a09f39047e4940cf73c1d6130572 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -353,6 +353,7 @@ public class PurpurConfig {
+@@ -360,6 +360,7 @@ public class PurpurConfig {
     public static boolean enderChestSixRows = false;
     public static boolean enderChestPermissionRows = false;
     public static boolean cryingObsidianValidForPortalFrame = false;
@@ -29,7 +29,7 @@ index de340a9c0abdc8bc2cbdc71f1858a9ddd549aa94..d3f6ced425cca6e80eca485c60076914
     private static void blockSettings() {
         if (version < 3) {
             boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -368,6 +369,7 @@ public class PurpurConfig {
+@@ -375,6 +376,7 @@ public class PurpurConfig {
         org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
         enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
         cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
--- a/patches/server/0188-Gamemode-extra-permissions.patch
+++ b/patches/server/0188-Gamemode-extra-permissions.patch
@@ -54,10 +54,10 @@ index 79f6089b934124c3309c6bee2e48b36b937252e0..dff8ef0a1a2e52792070d93685c29002
 
         for(ServerPlayer serverPlayer : targets) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index d3f6ced425cca6e80eca485c6007691404c5785b..c1926d71aafe3e114f75be5738ab9e3035641894 100644
+index 14e732da4c80a09f39047e4940cf73c1d6130572..36a1e1bd8988b1dbad1aa8edb59c010d1af629d9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -336,6 +336,7 @@ public class PurpurConfig {
+@@ -343,6 +343,7 @@ public class PurpurConfig {
     public static String commandTPSBarTextColorMedium = "<gradient:#ffff55:#ffaa00><text></gradient>";
     public static String commandTPSBarTextColorLow = "<gradient:#ff5555:#aa0000><text></gradient>";
     public static int commandTPSBarTickInterval = 20;
@@ -65,7 +65,7 @@ index d3f6ced425cca6e80eca485c6007691404c5785b..c1926d71aafe3e114f75be5738ab9e30
     private static void commandSettings() {
         commandTPSBarTitle = getString("settings.command.tpsbar.title", commandTPSBarTitle);
         commandTPSBarProgressOverlay = BossBar.Overlay.valueOf(getString("settings.command.tpsbar.overlay", commandTPSBarProgressOverlay.name()));
-@@ -347,6 +348,7 @@ public class PurpurConfig {
+@@ -354,6 +355,7 @@ public class PurpurConfig {
         commandTPSBarTextColorMedium = getString("settings.command.tpsbar.text-color.medium", commandTPSBarTextColorMedium);
         commandTPSBarTextColorLow = getString("settings.command.tpsbar.text-color.low", commandTPSBarTextColorLow);
         commandTPSBarTickInterval = getInt("settings.command.tpsbar.tick-interval", commandTPSBarTickInterval);
--- a/patches/server/0194-Hide-hidden-players-from-entity-selector.patch
+++ b/patches/server/0194-Hide-hidden-players-from-entity-selector.patch
@@ -59,10 +59,10 @@ index 0fb8f32427843f4bfd90ab88ecb3ab3e4a4fda31..f99f1ba7f912a2fd503e12c446b342a8
 +    // Purpur end
 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 23674fa9b99c79ffe1b2ee88d0e25b5ab8c91fac..45626d15e91ac2c0fa745f2670d3877a7387e0d2 100644
+index 5052879dd910180918052d9cc00df63e398479ee..0496d20d982815cc1c56051331ffb51e3d9d0038 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -349,6 +349,7 @@ public class PurpurConfig {
+@@ -356,6 +356,7 @@ public class PurpurConfig {
     public static String commandTPSBarTextColorLow = "<gradient:#ff5555:#aa0000><text></gradient>";
     public static int commandTPSBarTickInterval = 20;
     public static boolean commandGamemodeRequiresPermission = false;
@@ -70,7 +70,7 @@ index 23674fa9b99c79ffe1b2ee88d0e25b5ab8c91fac..45626d15e91ac2c0fa745f2670d3877a
     private static void commandSettings() {
         commandTPSBarTitle = getString("settings.command.tpsbar.title", commandTPSBarTitle);
         commandTPSBarProgressOverlay = BossBar.Overlay.valueOf(getString("settings.command.tpsbar.overlay", commandTPSBarProgressOverlay.name()));
-@@ -361,6 +362,7 @@ public class PurpurConfig {
+@@ -368,6 +369,7 @@ public class PurpurConfig {
         commandTPSBarTextColorLow = getString("settings.command.tpsbar.text-color.low", commandTPSBarTextColorLow);
         commandTPSBarTickInterval = getInt("settings.command.tpsbar.tick-interval", commandTPSBarTickInterval);
         commandGamemodeRequiresPermission = getBoolean("settings.command.gamemode.requires-specific-permission", commandGamemodeRequiresPermission);
--- a/patches/server/0202-Make-anvil-cumulative-cost-configurable.patch
+++ b/patches/server/0202-Make-anvil-cumulative-cost-configurable.patch
@@ -18,10 +18,10 @@ index f380659b261253e327f018ce9b54b15195ad65d7..080449cf3aa0394bd179e26fda8d7248
 
     public void setItemName(String newItemName) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index aa9bed62b71894b74f86ee1016d192293a702fd1..fc26cfc19f0af721eb9030cff691c4d65df06415 100644
+index b1cb0e5857509921c2f2c112e98ec2801ce5c4c2..dcb0aca3303b92f955700f784934396a4808f7ed 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -372,6 +372,7 @@ public class PurpurConfig {
+@@ -379,6 +379,7 @@ public class PurpurConfig {
     public static boolean enderChestPermissionRows = false;
     public static boolean cryingObsidianValidForPortalFrame = false;
     public static int beeInsideBeeHive = 3;
@@ -29,7 +29,7 @@ index aa9bed62b71894b74f86ee1016d192293a702fd1..fc26cfc19f0af721eb9030cff691c4d6
     private static void blockSettings() {
         if (version < 3) {
             boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -388,6 +389,7 @@ public class PurpurConfig {
+@@ -395,6 +396,7 @@ public class PurpurConfig {
         enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
         cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
         beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);
--- a/patches/server/0212-Make-lightning-rod-range-configurable.patch
+++ b/patches/server/0212-Make-lightning-rod-range-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make lightning rod range configurable


 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 27d41f7e03404d349a465848235c63b1f5e3200c..da0095bf9f2237dc4846f655e4698b0976224771 100644
+index 124c9bdba9dc95390831e9c43ddacca0bb356c95..298e37f35167434a3ee403e28808fbebb5a7809c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1002,7 +1002,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -18,10 +18,10 @@ index 27d41f7e03404d349a465848235c63b1f5e3200c..da0095bf9f2237dc4846f655e4698b09
         return optional.map((blockposition1) -> {
             return blockposition1.above(1);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index fc26cfc19f0af721eb9030cff691c4d65df06415..d881cdfd3d3c6244c65f54bfa953bc5b18a644af 100644
+index dcb0aca3303b92f955700f784934396a4808f7ed..f1db3948b7284da35b9905862229bafb87a863fb 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -373,6 +373,7 @@ public class PurpurConfig {
+@@ -380,6 +380,7 @@ public class PurpurConfig {
     public static boolean cryingObsidianValidForPortalFrame = false;
     public static int beeInsideBeeHive = 3;
     public static boolean anvilCumulativeCost = true;
@@ -29,7 +29,7 @@ index fc26cfc19f0af721eb9030cff691c4d65df06415..d881cdfd3d3c6244c65f54bfa953bc5b
     private static void blockSettings() {
         if (version < 3) {
             boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -390,6 +391,7 @@ public class PurpurConfig {
+@@ -397,6 +398,7 @@ public class PurpurConfig {
         cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
         beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);
         anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost);
--- a/patches/server/0223-Add-uptime-command.patch
+++ b/patches/server/0223-Add-uptime-command.patch
@@ -17,7 +17,7 @@ index 73953ea69776bfe1dcb1504cd14a0f003f1b5766..528fd87ae1c1c01e13885d88fc8056b0
         }
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 652e596c37bf8d865c954b31ad7d2562b9e95c46..e74ddf6b72dbd335f8a06f05341d5a4d99afa428 100644
+index fbb0840010443facb66b8e538c4fde035704896e..efddedd3fdec7fc146be5a572ce86e58d3c7c1e4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -294,6 +294,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -29,7 +29,7 @@ index 652e596c37bf8d865c954b31ad7d2562b9e95c46..e74ddf6b72dbd335f8a06f05341d5a4d
     public int autosavePeriod;
     public boolean serverAutoSave = false; // Paper
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index d881cdfd3d3c6244c65f54bfa953bc5b18a644af..07e5bb1b148376b3962a983b3d192bd838e04e02 100644
+index f1db3948b7284da35b9905862229bafb87a863fb..2def6767b2ee97d9c662b93796ed97bcfd3bbebc 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -166,6 +166,7 @@ public class PurpurConfig {
@@ -48,7 +48,7 @@ index d881cdfd3d3c6244c65f54bfa953bc5b18a644af..07e5bb1b148376b3962a983b3d192bd8
         unverifiedUsername = getString("settings.messages.unverified-username", unverifiedUsername);
     }
 
-@@ -352,6 +354,15 @@ public class PurpurConfig {
+@@ -359,6 +361,15 @@ public class PurpurConfig {
     public static int commandTPSBarTickInterval = 20;
     public static boolean commandGamemodeRequiresPermission = false;
     public static boolean hideHiddenPlayersFromEntitySelector = false;
@@ -64,7 +64,7 @@ index d881cdfd3d3c6244c65f54bfa953bc5b18a644af..07e5bb1b148376b3962a983b3d192bd8
     private static void commandSettings() {
         commandTPSBarTitle = getString("settings.command.tpsbar.title", commandTPSBarTitle);
         commandTPSBarProgressOverlay = BossBar.Overlay.valueOf(getString("settings.command.tpsbar.overlay", commandTPSBarProgressOverlay.name()));
-@@ -365,6 +376,15 @@ public class PurpurConfig {
+@@ -372,6 +383,15 @@ public class PurpurConfig {
         commandTPSBarTickInterval = getInt("settings.command.tpsbar.tick-interval", commandTPSBarTickInterval);
         commandGamemodeRequiresPermission = getBoolean("settings.command.gamemode.requires-specific-permission", commandGamemodeRequiresPermission);
         hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);
--- a/patches/server/0226-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch
+++ b/patches/server/0226-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] SPIGOT-5988 Fix bed respawn location not resetting


 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5c9cb6fa72fef151b6c9038e2536a4fdf330375e..bea7b50888462b89c82da756d0a72226a0cdb3fc 100644
+index 94df8ba1b38fb5df039d5ddcb0374d0147d9b3ed..54f5e11b636649d1fb5a1b5cc05427b81341e10f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -903,6 +903,7 @@ public abstract class PlayerList {
@@ -17,10 +17,10 @@ index 5c9cb6fa72fef151b6c9038e2536a4fdf330375e..bea7b50888462b89c82da756d0a72226
             }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 808d763e767fd4f727c5f0a735c3e5d4ac17a47e..0fada677e0aa6ffa4b654d7eae307863d8fc6e59 100644
+index 97dba790a02fe54da4278c7e913dbbcf8a25d126..60412d24201bbd61162662b3a2270eecab39fa3d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -400,6 +400,7 @@ public class PurpurConfig {
+@@ -407,6 +407,7 @@ public class PurpurConfig {
     public static int beeInsideBeeHive = 3;
     public static boolean anvilCumulativeCost = true;
     public static int lightningRodRange = 128;
@@ -28,7 +28,7 @@ index 808d763e767fd4f727c5f0a735c3e5d4ac17a47e..0fada677e0aa6ffa4b654d7eae307863
     private static void blockSettings() {
         if (version < 3) {
             boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -418,6 +419,7 @@ public class PurpurConfig {
+@@ -425,6 +426,7 @@ public class PurpurConfig {
         beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);
         anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost);
         lightningRodRange = getInt("settings.blocks.lightning_rod.range", lightningRodRange);
--- a/patches/server/0236-Add-compass-command.patch
+++ b/patches/server/0236-Add-compass-command.patch
@@ -81,10 +81,10 @@ index 9d541c9e53f3f8db871f01f8d083e4cfc0de0de1..046bf9cbf02b002e89f7d39b616dd0f5
                 CompoundTag compoundTag = stack.getOrCreateTag();
                 if (compoundTag.contains("LodestoneTracked") && !compoundTag.getBoolean("LodestoneTracked")) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 8244f362f551ed2bdef4df8e6b83cb176b4a4e59..11e20b7ab11dfc2549eec53e4e0829f14f261a8e 100644
+index adfec9c94849b5371e9188eb0ce18565c2d17fc9..526a1032a2f61792c7f5791dbb3e9a7292fc186d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -362,6 +362,11 @@ public class PurpurConfig {
+@@ -369,6 +369,11 @@ public class PurpurConfig {
     public static String commandTPSBarTextColorMedium = "<gradient:#ffff55:#ffaa00><text></gradient>";
     public static String commandTPSBarTextColorLow = "<gradient:#ff5555:#aa0000><text></gradient>";
     public static int commandTPSBarTickInterval = 20;
@@ -96,7 +96,7 @@ index 8244f362f551ed2bdef4df8e6b83cb176b4a4e59..11e20b7ab11dfc2549eec53e4e0829f1
     public static boolean commandGamemodeRequiresPermission = false;
     public static boolean hideHiddenPlayersFromEntitySelector = false;
     public static String uptimeFormat = "<days><hours><minutes><seconds>";
-@@ -384,6 +389,13 @@ public class PurpurConfig {
+@@ -391,6 +396,13 @@ public class PurpurConfig {
         commandTPSBarTextColorMedium = getString("settings.command.tpsbar.text-color.medium", commandTPSBarTextColorMedium);
         commandTPSBarTextColorLow = getString("settings.command.tpsbar.text-color.low", commandTPSBarTextColorLow);
         commandTPSBarTickInterval = getInt("settings.command.tpsbar.tick-interval", commandTPSBarTickInterval);