Updated Upstream (Paper)

gradle.properties

@@ -2,7 +2,7 @@ group=org.galemc.gale
 version=1.19.3-R0.1-SNAPSHOT
 
 mcVersion=1.19.3
-paperRef=bb05fcf4ca55dc3afc57e723cba6eca530ae3c25
+paperRef=27516ee39ea7be95b5eb4ea700a2df4aeab147d6
 
 org.gradle.caching=true
 org.gradle.parallel=true

patches/api/0001-Hide-irrelevant-compilation-warnings.patch

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 3c4dd6ebc2289c44c2f5723e7920aadffdc51884..f983a2c154da233919c277d951c7ddbeeaabf2e1 100644
+index c16ebc233bce9fd2020d3dde6253c3b90000c0f3..96191e3d1b0c8f3be37daa02a719ddad883dd95f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -83,6 +83,15 @@ val generateApiVersioningFile by tasks.registering {
+@@ -84,6 +84,15 @@ val generateApiVersioningFile by tasks.registering {
      }
  }
  
@@ -26,7 +26,7 @@ index 3c4dd6ebc2289c44c2f5723e7920aadffdc51884..f983a2c154da233919c277d951c7ddbe
  tasks.jar {
      from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
          into("META-INF/maven/${project.group}/${project.name}")
-@@ -131,6 +140,8 @@ tasks.withType<Javadoc> {
+@@ -132,6 +141,8 @@ tasks.withType<Javadoc> {
              into("build/docs/javadoc")
          }
      }

patches/api/0004-SIMD-support.patch

@@ -13,10 +13,10 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index f983a2c154da233919c277d951c7ddbeeaabf2e1..e19c9544c346e7f505cfdd379be7f8f059d9e53d 100644
+index 96191e3d1b0c8f3be37daa02a719ddad883dd95f..1f8ce35cbc0802917d6fb166fe276a22b03835ed 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -89,6 +89,7 @@ tasks.withType<JavaCompile> {
+@@ -90,6 +90,7 @@ tasks.withType<JavaCompile> {
      compilerArgs.add("-Xlint:-module")
      compilerArgs.add("-Xlint:-removal")
      compilerArgs.add("-Xlint:-dep-ann")
@@ -24,7 +24,7 @@ index f983a2c154da233919c277d951c7ddbeeaabf2e1..e19c9544c346e7f505cfdd379be7f8f0
  }
  // Gale end - hide irrelevant compilation warnings
  
-@@ -142,6 +143,7 @@ tasks.withType<Javadoc> {
+@@ -143,6 +144,7 @@ tasks.withType<Javadoc> {
      }
  
      options.addStringOption("Xdoclint:none", "-quiet") // Gale - hide irrelevant compilation warnings

patches/server/0003-Hide-irrelevant-compilation-warnings.patch

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index b7dab09e5cab1098211851ecd9555c9be68071e4..977edc4adb5414e83d289cca295baa6bfbadaa52 100644
+index 7ed5c129d24d56dd90083c5a52721d359f617159..3a8f82fdbecb34b32054cd5bdd30759f5ecab7fa 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -55,6 +55,16 @@ dependencies {
+@@ -56,6 +56,16 @@ dependencies {
  }
  
  val craftbukkitPackageVersion = "1_19_R2" // Paper

patches/server/0004-Use-default-Java-installation-for-development-runs.patch

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e8187f4b88f89eee3fd675bbfdfb78534769c63f..9f42ad14bd477a265f0c7f1fda5bc39a69970ed7 100644
+index 3a8f82fdbecb34b32054cd5bdd30759f5ecab7fa..172644d99e3632a3c5f0fdb5d1d847f2796b4230 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -149,6 +149,15 @@ fun TaskContainer.registerRunTask(
+@@ -150,6 +150,15 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {

patches/server/0005-Enable-virtual-threads-for-development-runs.patch

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 9f42ad14bd477a265f0c7f1fda5bc39a69970ed7..bfcdae815faa1fc326b80fb317d3046bd05b85f5 100644
+index 172644d99e3632a3c5f0fdb5d1d847f2796b4230..595957438cc6321d11d1178a74846397b7d30aaa 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -181,6 +181,10 @@ fun TaskContainer.registerRunTask(
+@@ -182,6 +182,10 @@ fun TaskContainer.registerRunTask(
      val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")
      val modifiedJvmArgs = jvmArgs ?: arrayListOf()
      modifiedJvmArgs.addAll(listOf("-Xms${memoryGb}G", "-Xmx${memoryGb}G"))

patches/server/0006-Gale-branding-changes.patch

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index bfcdae815faa1fc326b80fb317d3046bd05b85f5..0bdb5eeebde6aa8a7d0b3d8dd29ea93f2db859bb 100644
+index 595957438cc6321d11d1178a74846397b7d30aaa..21dde8d45c98fc57b97d847908c011808d2e3b85 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -77,7 +77,7 @@ tasks.jar {
+@@ -78,7 +78,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -218,7 +218,7 @@ index 710ca7d3a5659953f64bc6dccdd93b43300961cc..83e161c50f12e10afa481a85001c1d22
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bfc4ee36befb925ab4eb6b96f5c1aa6c76bf711f..0739d32db0dd69965fd0c93be6a1f2c7448d3439 100644
+index f938095d999412d88fa3fcf76b87253034124cb9..715ca54906ce0f7ce738e805cc74750dc521c63f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper
@@ -244,10 +244,10 @@ index cdefb2025eedea7e204d70d568adaf1c1ec4c03c..3997a7fec43e05b455644b4d58c68995
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index daeaa30cdd64f5cb775304e82f2390684c02a9d3..58397008c783c6802f846110ee405bb5f8ba2851 100644
+index 287e8c4c57ea1737460fdaf114e7eed627a25b2d..6d7e14ac2f28cff95c6995a7fc06956cd5c1bd25 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -433,7 +433,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -462,7 +462,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
  
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {

patches/server/0008-Gale-configuration.patch

@@ -462,10 +462,10 @@ index 3cbf801b2e5420c0e870f73788deb550e49ad54d..6b5740e4e73a753c9516d7cbde575c18
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0739d32db0dd69965fd0c93be6a1f2c7448d3439..a7326db69297f46cd403114069a1d5c033ffb809 100644
+index 715ca54906ce0f7ce738e805cc74750dc521c63f..ef1ab585c27df057c330d47a12cc21875f04659f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -979,6 +979,7 @@ public final class CraftServer implements Server {
+@@ -980,6 +980,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
@@ -473,7 +473,7 @@ index 0739d32db0dd69965fd0c93be6a1f2c7448d3439..a7326db69297f46cd403114069a1d5c0
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -2763,6 +2764,14 @@ public final class CraftServer implements Server {
+@@ -2764,6 +2765,14 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
  

patches/server/0028-Print-stack-trace-for-plugins-not-shutting-down-task.patch

@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a7326db69297f46cd403114069a1d5c033ffb809..3107642e3e0888ff599e89ca21dd5f2c8b152448 100644
+index ef1ab585c27df057c330d47a12cc21875f04659f..ab078ac735a7820b1d191fc90e51cc1b55da1303 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1066,6 +1066,13 @@ public final class CraftServer implements Server {
+@@ -1067,6 +1067,13 @@ public final class CraftServer implements Server {
                  plugin.getDescription().getName(),
                  "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
              ));

patches/server/0046-SIMD-support.patch

@@ -13,10 +13,10 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 0bdb5eeebde6aa8a7d0b3d8dd29ea93f2db859bb..22864c8810bacd23b3ebaedce1c87f1441873184 100644
+index 21dde8d45c98fc57b97d847908c011808d2e3b85..a82ce4dfde0a81a85def5e3e5b09ba3a15aa73bc 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -62,6 +62,7 @@ tasks.withType<JavaCompile> {
+@@ -63,6 +63,7 @@ tasks.withType<JavaCompile> {
      compilerArgs.add("-Xlint:-module")
      compilerArgs.add("-Xlint:-removal")
      compilerArgs.add("-Xlint:-dep-ann")
@@ -24,7 +24,7 @@ index 0bdb5eeebde6aa8a7d0b3d8dd29ea93f2db859bb..22864c8810bacd23b3ebaedce1c87f14
  }
  // Gale end - hide irrelevant compilation warnings
  
-@@ -185,6 +186,7 @@ fun TaskContainer.registerRunTask(
+@@ -186,6 +187,7 @@ fun TaskContainer.registerRunTask(
      modifiedJvmArgs.add("--enable-preview")
      modifiedJvmArgs.addAll(listOf("--add-opens", "java.base/java.lang=ALL-UNNAMED"))
      // Gale end - enable virtual threads for development runs

patches/server/0077-Fix-MC-26304.patch

@@ -13,7 +13,7 @@ As part of: Mirai (https://github.com/etil2jz/Mirai)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
-index 55006724ccec9f3de828ec18693728e9741ff65f..7dfc0081591b1c8e5a7c704ebc5e9d83951cb300 100644
+index 0bab2693b91d5bab222c7db8bc6965ccde954003..4b56e5113136039cf2714ea71f0c51bebae3ab39 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
 @@ -6,6 +6,7 @@ import javax.annotation.Nullable;
@@ -24,7 +24,7 @@ index 55006724ccec9f3de828ec18693728e9741ff65f..7dfc0081591b1c8e5a7c704ebc5e9d83
  import net.minecraft.nbt.CompoundTag;
  import net.minecraft.network.chat.Component;
  import net.minecraft.world.ContainerHelper;
-@@ -47,6 +48,7 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
+@@ -48,6 +49,7 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
      public static final int DATA_BREW_TIME = 0;
      public static final int DATA_FUEL_USES = 1;
      public static final int NUM_DATA_VALUES = 2;
@@ -32,7 +32,7 @@ index 55006724ccec9f3de828ec18693728e9741ff65f..7dfc0081591b1c8e5a7c704ebc5e9d83
      private NonNullList<ItemStack> items;
      public int brewTime;
      private boolean[] lastPotionCount;
-@@ -295,6 +297,22 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
+@@ -300,6 +302,22 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
          ContainerHelper.loadAllItems(nbt, this.items);
          this.brewTime = nbt.getShort("BrewTime");
          this.fuel = nbt.getByte("Fuel");
@@ -55,7 +55,7 @@ index 55006724ccec9f3de828ec18693728e9741ff65f..7dfc0081591b1c8e5a7c704ebc5e9d83
      }
  
      @Override
-@@ -303,6 +321,18 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
+@@ -308,6 +326,18 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
          nbt.putShort("BrewTime", (short) this.brewTime);
          ContainerHelper.saveAllItems(nbt, this.items);
          nbt.putByte("Fuel", (byte) this.fuel);

patches/server/0129-CraftBukkit-UUID-to-world-map.patch

@@ -13,7 +13,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3107642e3e0888ff599e89ca21dd5f2c8b152448..3553b7cbbbcc2aff07be6bdcfbfceb8044675d77 100644
+index ab078ac735a7820b1d191fc90e51cc1b55da1303..506db21eb8a8ae566acaca6275ad95c0d59594fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -48,6 +48,9 @@ import java.util.logging.Level;
@@ -34,7 +34,7 @@ index 3107642e3e0888ff599e89ca21dd5f2c8b152448..3553b7cbbbcc2aff07be6bdcfbfceb80
      private final Map<Class<?>, Registry<?>> registries = new HashMap<>();
      private YamlConfiguration configuration;
      private YamlConfiguration commandsConfiguration;
-@@ -1342,6 +1346,7 @@ public final class CraftServer implements Server {
+@@ -1343,6 +1347,7 @@ public final class CraftServer implements Server {
              this.getLogger().log(Level.SEVERE, null, ex);
          }
  
@@ -42,7 +42,7 @@ index 3107642e3e0888ff599e89ca21dd5f2c8b152448..3553b7cbbbcc2aff07be6bdcfbfceb80
          this.worlds.remove(world.getName().toLowerCase(java.util.Locale.ENGLISH));
          this.console.removeLevel(handle);
          return true;
-@@ -1360,12 +1365,7 @@ public final class CraftServer implements Server {
+@@ -1361,12 +1366,7 @@ public final class CraftServer implements Server {
  
      @Override
      public World getWorld(UUID uid) {
@@ -56,7 +56,7 @@ index 3107642e3e0888ff599e89ca21dd5f2c8b152448..3553b7cbbbcc2aff07be6bdcfbfceb80
      }
  
      // Paper start
-@@ -1383,6 +1383,7 @@ public final class CraftServer implements Server {
+@@ -1384,6 +1384,7 @@ public final class CraftServer implements Server {
              System.out.println("World " + world.getName() + " is a duplicate of another world and has been prevented from loading. Please delete the uid.dat file from " + world.getName() + "'s world directory if you want to be able to load the duplicate world.");
              return;
          }

patches/server/0131-Specific-interval-TPS-API.patch

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3553b7cbbbcc2aff07be6bdcfbfceb8044675d77..ec1b0178a7c6d12e79cdbd4e52bd22613f8af7eb 100644
+index 506db21eb8a8ae566acaca6275ad95c0d59594fe..f403817c85e7a4adfcfa09c2f102ea257bbaaad4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2732,6 +2732,25 @@ public final class CraftServer implements Server {
+@@ -2733,6 +2733,25 @@ public final class CraftServer implements Server {
          };
      }
  

patches/server/0132-5-second-TPS-average.patch

@@ -79,10 +79,10 @@ index c485cec0e9f4e1d55b526c8f6d915a355538a475..98c8c5946b2474676a5b6af76f23140d
                      tps5.add(currentTps, diff);
                      tps15.add(currentTps, diff);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ec1b0178a7c6d12e79cdbd4e52bd22613f8af7eb..cba623f82835e189ec615948c939ce4e4c690215 100644
+index f403817c85e7a4adfcfa09c2f102ea257bbaaad4..80274dbb800650302cf33e85833eac333bc183c7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2734,6 +2734,13 @@ public final class CraftServer implements Server {
+@@ -2735,6 +2735,13 @@ public final class CraftServer implements Server {
  
      // Gale start - specific interval TPS API
  

patches/server/0134-Last-tick-time-API.patch

@@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cba623f82835e189ec615948c939ce4e4c690215..b9a799997e3475117ab91d7f3edb5f2f243a9f6b 100644
+index 80274dbb800650302cf33e85833eac333bc183c7..3b64d9a7c3f759ba871c196296a1993751b93472 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2981,4 +2981,22 @@ public final class CraftServer implements Server {
+@@ -2982,4 +2982,22 @@ public final class CraftServer implements Server {
      }
  
      // Paper end

patches/server/0150-Base-thread-pool.patch

@@ -1768,10 +1768,10 @@ index 93f722537a6b479561d79ba2e980c50a324f9486..728f52999ea980ea2cef97ba80d3da96
                      final Entity entity = level.getEntity(this.ownerUUID);
                      if (entity != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e23fdd5ba09b50b7eef0ca4f36c5480779fba624..a7bb3275b2da8308696b18fb527514f9c4859d35 100644
+index dc5020580d1a26f1fcb31af2fd272e5d8bcaa480..a618eb60a7f6af1174e9cf1428fdd1cddceaf56d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -986,7 +986,7 @@ public final class CraftServer implements Server {
+@@ -987,7 +987,7 @@ public final class CraftServer implements Server {
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
          this.console.galeConfigurations.reloadConfigs(this.console); // Gale - Gale configuration
@@ -1780,7 +1780,7 @@ index e23fdd5ba09b50b7eef0ca4f36c5480779fba624..a7bb3275b2da8308696b18fb527514f9
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
  
-@@ -1170,7 +1170,7 @@ public final class CraftServer implements Server {
+@@ -1171,7 +1171,7 @@ public final class CraftServer implements Server {
  
      @Override
      public World createWorld(WorldCreator creator) {
@@ -1789,7 +1789,7 @@ index e23fdd5ba09b50b7eef0ca4f36c5480779fba624..a7bb3275b2da8308696b18fb527514f9
          //Preconditions.checkState(!this.console.isIteratingOverLevels, "Cannot create a world while worlds are being ticked"); // Paper - Cat - Temp disable. We'll see how this goes.
          Validate.notNull(creator, "Creator may not be null");
  
-@@ -2526,7 +2526,7 @@ public final class CraftServer implements Server {
+@@ -2527,7 +2527,7 @@ public final class CraftServer implements Server {
      public Entity getEntity(UUID uuid) {
          Validate.notNull(uuid, "UUID cannot be null");
  

patches/server/0151-Watch-for-blocking-base-threads.patch

@@ -7,7 +7,7 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 22864c8810bacd23b3ebaedce1c87f1441873184..b3237ddd0dabce383043947fe17d795901e89735 100644
+index a82ce4dfde0a81a85def5e3e5b09ba3a15aa73bc..f5999d4e9834e19669301612044857d34bd64daa 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -15,6 +15,7 @@ dependencies {
@@ -18,7 +18,7 @@ index 22864c8810bacd23b3ebaedce1c87f1441873184..b3237ddd0dabce383043947fe17d7959
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -178,6 +179,7 @@ fun TaskContainer.registerRunTask(
+@@ -179,6 +180,7 @@ fun TaskContainer.registerRunTask(
      if (providers.gradleProperty("paper.runDisableWatchdog").getOrElse("false") == "true") {
          systemProperty("disable.watchdog", true)
      }
@@ -26,7 +26,7 @@ index 22864c8810bacd23b3ebaedce1c87f1441873184..b3237ddd0dabce383043947fe17d7959
  
      val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")
      val modifiedJvmArgs = jvmArgs ?: arrayListOf()
-@@ -187,6 +189,7 @@ fun TaskContainer.registerRunTask(
+@@ -188,6 +190,7 @@ fun TaskContainer.registerRunTask(
      modifiedJvmArgs.addAll(listOf("--add-opens", "java.base/java.lang=ALL-UNNAMED"))
      // Gale end - enable virtual threads for development runs
      modifiedJvmArgs.add("--add-modules=jdk.incubator.vector") // Gale - Pufferfish - SIMD support