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)

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

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);
 +    }

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");
 +    }
  }

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");
      }
 +

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 {

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");

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");
      }
 

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);
      }
 

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);
      }

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);
      }
 

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);
      }

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);
      }
 

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);
      }
 

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);
      }
 

patches/server/0099-Crying-obsidian-valid-for-portal-frames.patch

@@ -18,18 +18,18 @@ 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;
 +    public static boolean cryingObsidianValidForPortalFrame = false;
      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);