Updated Upstream (Paper)

gradle.properties

@@ -2,7 +2,7 @@ group=org.galemc.gale
 version=1.20-R0.1-SNAPSHOT
 
 mcVersion=1.20
-paperRef=3722877c3c16e4e88c45a5133ec7a0e9efdd1f92
+paperRef=c287e921a96438964f32f3c4e394d6809e0d06fa
 
 org.gradle.caching=true
 org.gradle.parallel=true

patches/api/0002-Gale-configuration.patch

@@ -13,10 +13,10 @@ As part of: Paper (https://github.com/PaperMC/Paper)
 Licensed under: MIT (https://opensource.org/licenses/MIT)
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1d1a1d087dabc9794e0062a064da2cced4062309..973e752f61727eb22d086cb1593ea2ed7ac9ba5b 100644
+index 5b225bbb128893d67251a96ab318035802a0cf76..bb0a0f853e80e26f919b60fcae51029514558395 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1992,6 +1992,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2005,6 +2005,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          {
              throw new UnsupportedOperationException("Not supported yet.");
          }

patches/api/0007-Player-canSee-by-entity-UUID.patch

@@ -37,7 +37,7 @@ 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/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 997afb6739c72529ea8226228a9905d72f77c89a..37ab594c0323a1e85c53646f07d2f4ffef62f7c9 100644
+index 4ee0eb177f6b5765a9d7263576bb36c8a8366979..ddd7267f30c7ca2d6fdb1af71ceaf2bceb38c52a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3,6 +3,8 @@ package org.bukkit.entity;
@@ -49,7 +49,7 @@ index 997afb6739c72529ea8226228a9905d72f77c89a..37ab594c0323a1e85c53646f07d2f4ff
  import org.bukkit.DyeColor;
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
-@@ -1672,6 +1674,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1685,6 +1687,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @ApiStatus.Experimental
      public boolean canSee(@NotNull Entity entity);
  

patches/api/0008-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/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index b0bc2df41506770e2854a287813f1c53f003eda1..b214bf1bfc2caba7167dc9ae67ea10793c69be29 100644
+index ef36d793ab77c7b7208f8f5994815599cff470d1..f3f3470f2e07e5e06f599ddc0e5538dfc7a4c283 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2091,6 +2091,37 @@ public final class Bukkit {
+@@ -2108,6 +2108,37 @@ public final class Bukkit {
          return server.getTPS();
      }
  
@@ -49,10 +49,10 @@ index b0bc2df41506770e2854a287813f1c53f003eda1..b214bf1bfc2caba7167dc9ae67ea1079
       * Get a sample of the servers last tick times (in nanos)
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 973e752f61727eb22d086cb1593ea2ed7ac9ba5b..eaadeb929a1c4227b22e0cb2934d01b0e3669436 100644
+index bb0a0f853e80e26f919b60fcae51029514558395..bac4fccdd56d04e1c130986eb35a2d0c0dd03983 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1774,6 +1774,31 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1787,6 +1787,31 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public double[] getTPS();
  

patches/api/0009-5-second-TPS-average.patch

@@ -37,10 +37,10 @@ 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/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index b214bf1bfc2caba7167dc9ae67ea10793c69be29..b5042ccfad1f99cce88b3a8878da15909333c3a0 100644
+index f3f3470f2e07e5e06f599ddc0e5538dfc7a4c283..343123836a843e633adc0c9bcdcd3d89572e70e2 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2091,8 +2091,30 @@ public final class Bukkit {
+@@ -2108,8 +2108,30 @@ public final class Bukkit {
          return server.getTPS();
      }
  
@@ -72,10 +72,10 @@ index b214bf1bfc2caba7167dc9ae67ea10793c69be29..b5042ccfad1f99cce88b3a8878da1590
       * Gets the average server TPS over the last 1 minute
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index eaadeb929a1c4227b22e0cb2934d01b0e3669436..237b837a790bb3a3e33ae5731f550b1e8b55437b 100644
+index bac4fccdd56d04e1c130986eb35a2d0c0dd03983..4fabb37be76d85f111d8cbd6ca967bb0ca8f58de 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1774,8 +1774,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1787,8 +1787,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public double[] getTPS();
  

patches/api/0010-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/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index b5042ccfad1f99cce88b3a8878da15909333c3a0..8b66e73c03ef016b99e0480b951140c1c6be6ec4 100644
+index 343123836a843e633adc0c9bcdcd3d89572e70e2..bc84a2b89218fc1e21bddf25ca342c6e2bf9984c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2532,6 +2532,20 @@ public final class Bukkit {
+@@ -2549,6 +2549,20 @@ public final class Bukkit {
      }
      // Paper end
  
@@ -48,10 +48,10 @@ index b5042ccfad1f99cce88b3a8878da15909333c3a0..8b66e73c03ef016b99e0480b951140c1
      public static Server.Spigot spigot() {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 237b837a790bb3a3e33ae5731f550b1e8b55437b..007e23a9383ab8eda12c6dffb385256215356040 100644
+index 4fabb37be76d85f111d8cbd6ca967bb0ca8f58de..714ea77b4509ba842c764e78e0bfc1862abcd537 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2215,4 +2215,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2228,4 +2228,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
      // Paper end

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 0bf73437d6aabadc2b784ff62f2854bcfc4c2a11..b0066dc98abf596fc60ff2d4b0761f5845d5ffa5 100644
+index c7a72ad4bcd4529f62b28ab4af3504a4e749927f..2cbebfc91e62395ab15185c55a2fa323f9b1882f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -56,6 +56,16 @@ dependencies {
+@@ -57,6 +57,16 @@ dependencies {
  }
  
  val craftbukkitPackageVersion = "1_20_R1" // 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 0b3f1508c2d461a11cf26e9e298e15e3650daccf..1f7d0aa2d36b59c23a04e94dc117da987bc1a0b2 100644
+index 2cbebfc91e62395ab15185c55a2fa323f9b1882f..b6106ec031efd679871bddde7ebafce518381b8c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -150,6 +150,15 @@ fun TaskContainer.registerRunTask(
+@@ -151,6 +151,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 ab3633eb6552bde9ac6fc16d3a5feb6d1f0992bc..86a8726e033f405cb0c8b4289f21dca16431718e 100644
+index b6106ec031efd679871bddde7ebafce518381b8c..794aa5ec516d6d1f2c633bcdb53232515a06e32a 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -183,6 +183,10 @@ fun TaskContainer.registerRunTask(
+@@ -184,6 +184,10 @@ fun TaskContainer.registerRunTask(
      val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")
      minHeapSize = "${memoryGb}G"
      maxHeapSize = "${memoryGb}G"

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

@@ -11,10 +11,10 @@ License for non-image files: 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 7400f732562df7aaf10f7059e8085df95de792f3..860a744f61db62bb95374c6e7a4ebfd2cd51f35a 100644
+index 794aa5ec516d6d1f2c633bcdb53232515a06e32a..a35e8a5a66bcd1235edbf2ba1a245956f90117f7 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -78,7 +78,7 @@ tasks.jar {
+@@ -79,7 +79,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -194,10 +194,10 @@ index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..e45e6b44b2a8f2cdae6e0048a812b921
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fb82bb52f219e7683fe1d3c0fb3acbe2251de8d4..bc54a4d802b81877b45fc69631f09a9668b5ea78 100644
+index 80cf4852e4010eeeadaf920ab927a40df0179b40..d404cbb04e25ef145738fbd1cb2453acd96745ac 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -923,7 +923,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -921,7 +921,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          shutdownThread = Thread.currentThread();
          org.spigotmc.WatchdogThread.doStop(); // Paper
          if (!isSameThread()) {
@@ -212,7 +212,7 @@ index fb82bb52f219e7683fe1d3c0fb3acbe2251de8d4..bc54a4d802b81877b45fc69631f09a96
              while (this.getRunningThread().isAlive()) {
                  this.getRunningThread().stop();
                  try {
-@@ -1681,7 +1687,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1679,7 +1685,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -222,10 +222,10 @@ index fb82bb52f219e7683fe1d3c0fb3acbe2251de8d4..bc54a4d802b81877b45fc69631f09a96
  
      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 f87433133fa6a68dac33895f91770f453e0678d2..0ca28d30b0237cb2ec1097ed4c429397f8e3d414 100644
+index 9f8c5ceb8485b14a84f2a7b2ffc8192be5c6bdfd..0a3f5b354336e9acf70524c93f3386c6f7cdafe0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -262,7 +262,7 @@ import javax.annotation.Nullable; // Paper
+@@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
@@ -235,10 +235,10 @@ index f87433133fa6a68dac33895f91770f453e0678d2..0ca28d30b0237cb2ec1097ed4c429397
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index cdefb2025eedea7e204d70d568adaf1c1ec4c03c..3997a7fec43e05b455644b4d58c68995fad541f4 100644
+index d7ce4971d9271dbeff4adb9d852e4e7bdf60bf03..3dd7ee2e099199550b885947d33d8b27901ac373 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -504,7 +504,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -501,7 +501,7 @@ public class CraftScheduler implements BukkitScheduler {
                  this.parsePending();
              } else {
                  // this.debugTail = this.debugTail.setNext(new CraftAsyncDebugger(currentTick + CraftScheduler.RECENT_TICKS, task.getOwner(), task.getTaskClass())); // Paper
@@ -248,10 +248,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 b059bb46b649cbf82debdb8d58fe4ba77d040276..a5bb5c8a9a45a71356ddbe8702c414a0a60aa16b 100644
+index 8092db9de43ca4824374e1a76c85f71929521f6d..35da803d7679ba6d110764881dc7cad6823381b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -472,7 +472,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -470,7 +470,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
  
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
@@ -476,7 +476,7 @@ index 0000000000000000000000000000000000000000..4946618a2be455738a3b0222d91ed661
 +
 +}
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index e9fa7faaa4451e36b3908cbcbbe0baf213abde96..f29e48fc653affca2338d842a1a4972c5fa67f01 100644
+index 98fba0288be9ed2cb18ffba5cf81148157dd4fcf..08bdaab86269b0a24e61b3c9d69c18aca1a1d1f7 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -155,14 +155,20 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa

patches/server/0008-Gale-configuration.patch

@@ -225,7 +225,7 @@ index f6b9d216c24d8858802f85209fe1a869e5a9be31..1376290026401424619f95dead7fca63
 +    // Gale end - Gale configuration
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bc54a4d802b81877b45fc69631f09a9668b5ea78..2fbd75595dc222c2fb784e9e356a3dce530c6776 100644
+index d404cbb04e25ef145738fbd1cb2453acd96745ac..1c070563cfa76bf907c961cf3703214ec88a3f75 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -3,9 +3,6 @@ package net.minecraft.server;
@@ -264,7 +264,7 @@ index bc54a4d802b81877b45fc69631f09a9668b5ea78..2fbd75595dc222c2fb784e9e356a3dce
  import org.slf4j.Logger;
  
  // CraftBukkit start
-@@ -308,6 +306,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -306,6 +304,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public final double[] recentTps = new double[ 3 ];
      // Spigot end
      public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations;
@@ -272,7 +272,7 @@ index bc54a4d802b81877b45fc69631f09a9668b5ea78..2fbd75595dc222c2fb784e9e356a3dce
      public static long currentTickLong = 0L; // Paper
  
      public volatile Thread shutdownThread; // Paper
-@@ -410,6 +409,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -408,6 +407,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper end
          Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
          this.paperConfigurations = services.paperConfigurations(); // Paper
@@ -464,7 +464,7 @@ index 147d802d9207e358fdb2d1c7806fc2f634dcfd98..71189e98dcb71e625defe5a0bd635559
          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 7f3cb409e90dc0b558f583d0c83c91f5f76d6ea8..2301c9adfd70e130ee89c63481d9976cec0793e4 100644
+index 0a3f5b354336e9acf70524c93f3386c6f7cdafe0..eae08c4e9f6efb3cb6822b9e02776826920b2e5c 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 {
@@ -475,7 +475,7 @@ index 7f3cb409e90dc0b558f583d0c83c91f5f76d6ea8..2301c9adfd70e130ee89c63481d9976c
          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))
-@@ -2759,6 +2760,14 @@ public final class CraftServer implements Server {
+@@ -2776,6 +2777,14 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
  

patches/server/0016-Make-timings-calls-final.patch

@@ -7,10 +7,10 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2fbd75595dc222c2fb784e9e356a3dce530c6776..824b9b5374e0f4ccf2205ee55540ee9fcdec3c2c 100644
+index 1c070563cfa76bf907c961cf3703214ec88a3f75..f0c0f1098cfcc0bc4a3d9d0c5f8168bb217cda81 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1386,7 +1386,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1384,7 +1384,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public void onServerExit() {}
  
      public void tickServer(BooleanSupplier shouldKeepTicking) {
@@ -19,7 +19,7 @@ index 2fbd75595dc222c2fb784e9e356a3dce530c6776..824b9b5374e0f4ccf2205ee55540ee9f
          long i = Util.getNanos();
  
          // Paper start - move oversleep into full server tick
-@@ -1452,7 +1452,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1450,7 +1450,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.frameTimer.logFrameDuration(k - i);
          this.profiler.pop();
          org.spigotmc.WatchdogThread.tick(); // Spigot

patches/server/0017-Remove-vanilla-profiler.patch

@@ -73,7 +73,7 @@ index 80c2c8d565f03ae0ea24fbdecdbe2bc5b9aa4b82..3396c696a380f8ac64740acee887de82
  
          return b0;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 824b9b5374e0f4ccf2205ee55540ee9fcdec3c2c..a6d5dd36d297c976ad3302ae7c3c2080c978f68d 100644
+index f0c0f1098cfcc0bc4a3d9d0c5f8168bb217cda81..745727701051ebc8280ab61161e7b652f6abee8a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -107,18 +107,8 @@ import net.minecraft.util.ProgressListener;
@@ -110,7 +110,7 @@ index 824b9b5374e0f4ccf2205ee55540ee9fcdec3c2c..a6d5dd36d297c976ad3302ae7c3c2080
      private ServerConnectionListener connection;
      public final ChunkProgressListenerFactory progressListenerFactory;
      @Nullable
-@@ -337,13 +319,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -335,13 +317,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public MinecraftServer(OptionSet options, WorldLoader.DataLoadContext worldLoader, Thread thread, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PackRepository resourcepackrepository, WorldStem worldstem, Proxy proxy, DataFixer datafixer, Services services, ChunkProgressListenerFactory worldloadlistenerfactory) {
          super("Server");
          SERVER = this; // Paper - better singleton
@@ -124,7 +124,7 @@ index 824b9b5374e0f4ccf2205ee55540ee9fcdec3c2c..a6d5dd36d297c976ad3302ae7c3c2080
          this.random = RandomSource.create();
          this.port = -1;
          this.levels = Maps.newLinkedHashMap();
-@@ -939,9 +914,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -937,9 +912,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          // Paper end
          // CraftBukkit end
@@ -134,7 +134,7 @@ index 824b9b5374e0f4ccf2205ee55540ee9fcdec3c2c..a6d5dd36d297c976ad3302ae7c3c2080
  
          MinecraftServer.LOGGER.info("Stopping server");
          Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Shutdown and don't bother finishing
-@@ -1166,23 +1138,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1164,23 +1136,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  }
                  // Spigot end
  
@@ -158,7 +158,7 @@ index 824b9b5374e0f4ccf2205ee55540ee9fcdec3c2c..a6d5dd36d297c976ad3302ae7c3c2080
                  this.isReady = true;
                  JvmProfiler.INSTANCE.onServerTick(this.averageTickTime);
              }
-@@ -1343,7 +1305,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1341,7 +1303,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void doRunTask(TickTask ticktask) { // CraftBukkit - decompile error
@@ -166,7 +166,7 @@ index 824b9b5374e0f4ccf2205ee55540ee9fcdec3c2c..a6d5dd36d297c976ad3302ae7c3c2080
          super.doRunTask(ticktask);
      }
  
-@@ -1410,7 +1371,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1408,7 +1369,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (playerSaveInterval < 0) {
              playerSaveInterval = autosavePeriod;
          }
@@ -174,7 +174,7 @@ index 824b9b5374e0f4ccf2205ee55540ee9fcdec3c2c..a6d5dd36d297c976ad3302ae7c3c2080
          final boolean fullSave = autosavePeriod > 0 && this.tickCount % autosavePeriod == 0;
          try {
              this.isSaving = true;
-@@ -1425,7 +1385,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1423,7 +1383,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          } finally {
              this.isSaving = false;
          }
@@ -182,7 +182,7 @@ index 824b9b5374e0f4ccf2205ee55540ee9fcdec3c2c..a6d5dd36d297c976ad3302ae7c3c2080
          // Paper end
          io.papermc.paper.util.CachedLists.reset(); // Paper
          // Paper start - move executeAll() into full server tick timing
-@@ -1438,7 +1397,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1436,7 +1395,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          long remaining = (TICK_TIME - (endTime - lastTick)) - catchupTime;
          new com.destroystokyo.paper.event.server.ServerTickEndEvent(this.tickCount, ((double)(endTime - lastTick) / 1000000D), remaining).callEvent();
          // Paper end
@@ -190,7 +190,7 @@ index 824b9b5374e0f4ccf2205ee55540ee9fcdec3c2c..a6d5dd36d297c976ad3302ae7c3c2080
          long j = this.tickTimes[this.tickCount % 100] = Util.getNanos() - i;
  
          this.averageTickTime = this.averageTickTime * 0.8F + (float) j / 1000000.0F * 0.19999999F;
-@@ -1450,7 +1408,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1448,7 +1406,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          tickTimes60s.add(this.tickCount, j);
          // Paper end
          this.frameTimer.logFrameDuration(k - i);
@@ -198,7 +198,7 @@ index 824b9b5374e0f4ccf2205ee55540ee9fcdec3c2c..a6d5dd36d297c976ad3302ae7c3c2080
          org.spigotmc.WatchdogThread.tick(); // Spigot
          co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTimingFullServerTick(); // Paper // Gale - final timings calls
      }
-@@ -1488,11 +1445,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1486,11 +1443,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.server.getScheduler().mainThreadHeartbeat(this.tickCount); // CraftBukkit
          MinecraftTimings.bukkitSchedulerTimer.stopTiming(); // Spigot // Paper
          io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue(this.tickCount); // Paper
@@ -210,7 +210,7 @@ index 824b9b5374e0f4ccf2205ee55540ee9fcdec3c2c..a6d5dd36d297c976ad3302ae7c3c2080
          //Iterator iterator = this.getAllLevels().iterator(); // Paper - moved down
  
          // CraftBukkit start
-@@ -1533,19 +1488,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1531,19 +1486,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper
              worldserver.hasEntityMoveEvent =  io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
  
@@ -230,7 +230,7 @@ index 824b9b5374e0f4ccf2205ee55540ee9fcdec3c2c..a6d5dd36d297c976ad3302ae7c3c2080
              try {
                  worldserver.timings.doTick.startTiming(); // Spigot
                  worldserver.tick(shouldKeepTicking);
-@@ -1570,17 +1518,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1568,17 +1516,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  throw new ReportedException(crashreport);
              }
  
@@ -248,7 +248,7 @@ index 824b9b5374e0f4ccf2205ee55540ee9fcdec3c2c..a6d5dd36d297c976ad3302ae7c3c2080
          MinecraftTimings.playerListTimer.startTiming(); // Spigot // Paper
          this.playerList.tick();
          MinecraftTimings.playerListTimer.stopTiming(); // Spigot // Paper
-@@ -1588,15 +1532,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1586,15 +1530,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              GameTestTicker.SINGLETON.tick();
          }
  
@@ -264,7 +264,7 @@ index 824b9b5374e0f4ccf2205ee55540ee9fcdec3c2c..a6d5dd36d297c976ad3302ae7c3c2080
      }
  
      private void synchronizeTime(ServerLevel world) {
-@@ -1604,7 +1544,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1602,7 +1542,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void forceTimeSynchronization() {
@@ -272,7 +272,7 @@ index 824b9b5374e0f4ccf2205ee55540ee9fcdec3c2c..a6d5dd36d297c976ad3302ae7c3c2080
          Iterator iterator = this.getAllLevels().iterator();
  
          while (iterator.hasNext()) {
-@@ -1612,8 +1551,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1610,8 +1549,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              this.synchronizeTime(worldserver);
          }
@@ -281,7 +281,7 @@ index 824b9b5374e0f4ccf2205ee55540ee9fcdec3c2c..a6d5dd36d297c976ad3302ae7c3c2080
      }
  
      public boolean isNetherEnabled() {
-@@ -2265,10 +2202,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2263,10 +2200,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return this.frameTimer;
      }
  
@@ -292,7 +292,7 @@ index 824b9b5374e0f4ccf2205ee55540ee9fcdec3c2c..a6d5dd36d297c976ad3302ae7c3c2080
      public abstract boolean isSingleplayerOwner(GameProfile profile);
  
      public void dumpServerProperties(Path file) throws IOException {}
-@@ -2504,53 +2437,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2502,53 +2435,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
      // CraftBukkit end
  
@@ -346,7 +346,7 @@ index 824b9b5374e0f4ccf2205ee55540ee9fcdec3c2c..a6d5dd36d297c976ad3302ae7c3c2080
      public Path getWorldPath(LevelResource worldSavePath) {
          return this.storageSource.getLevelPath(worldSavePath);
      }
-@@ -2596,25 +2482,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2594,25 +2480,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return this.isSaving;
      }
  
@@ -372,7 +372,7 @@ index 824b9b5374e0f4ccf2205ee55540ee9fcdec3c2c..a6d5dd36d297c976ad3302ae7c3c2080
      public int getMaxChainedNeighborUpdates() {
          return 1000000;
      }
-@@ -2653,56 +2520,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2651,56 +2518,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
  
@@ -856,7 +856,7 @@ index 513916690d2579760f59edecb1a273f475d54adf..287f6a38a6f042983c5e652ff9800fb2
  
                  while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5fad40fa88f697108e42461c41012d5964ed7d75..f77f4cbdca0b22e0c24acbf08425e2e83ddef449 100644
+index 9d46536f80b5b3e6641fd377c02166a431edfd77..8badf1d6239eca7e48819860ada3a1ce21c3b4db 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1205,7 +1205,6 @@ public class ServerPlayer extends Player {
@@ -885,7 +885,7 @@ index 5fad40fa88f697108e42461c41012d5964ed7d75..f77f4cbdca0b22e0c24acbf08425e2e8
                  this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
                  playerlist.sendLevelInfo(this, worldserver);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ae82ab0e3d8e99f87ca8465fbcbb44b5ce18bf96..3d33236932c14d651d393656b06ae8152cc89eee 100644
+index d9c2d06ae24dcf80a497e75f4c7f63d401b77f9b..9689276806373b5721cde7c60f90f716862a630e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -395,7 +395,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -981,7 +981,7 @@ index 7ab57748b2f2aea1003d9b7e70e76c372aa1e432..47e75ec4a01f8a456ec6ebc13031c1f0
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 92202262eff01ae3bbeff0e6ebdcf26ad613c169..cc6bcffcc124f75bdaf4e72601d1557a173b7825 100644
+index b38c4cbcf0405d82c7b6e018e80a3174e460c1a4..88b8dc9e0b6a5182969507883d16a80592e8dabc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -797,7 +797,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1096,7 +1096,7 @@ index 92202262eff01ae3bbeff0e6ebdcf26ad613c169..cc6bcffcc124f75bdaf4e72601d1557a
              }
          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 67627bbf84f5aab2872f636b1dcb6728c8494147..5cf43c4d0ce6e3af5ea6c190db0c47c35b0a350c 100644
+index a189461330a4d427a7450d504ef13de3605497e3..9a56be04cb60ec09d145185aa07ef74ae4cd6f9b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -406,7 +406,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1115,7 +1115,7 @@ index 67627bbf84f5aab2872f636b1dcb6728c8494147..5cf43c4d0ce6e3af5ea6c190db0c47c3
      }
  
      public boolean canSpawnSoulSpeedParticle() {
-@@ -3044,10 +3042,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3047,10 +3045,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
          }
  
          this.run += (f3 - this.run) * 0.3F;
@@ -1126,7 +1126,7 @@ index 67627bbf84f5aab2872f636b1dcb6728c8494147..5cf43c4d0ce6e3af5ea6c190db0c47c3
  
          // Paper start - stop large pitch and yaw changes from crashing the server
          this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
-@@ -3059,7 +3054,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3062,7 +3057,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
          this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
          // Paper end
  
@@ -1134,7 +1134,7 @@ index 67627bbf84f5aab2872f636b1dcb6728c8494147..5cf43c4d0ce6e3af5ea6c190db0c47c3
          this.animStep += f2;
          if (this.isFallFlying()) {
              ++this.fallFlyTicks;
-@@ -3348,19 +3342,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3351,19 +3345,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
          }
  
          this.setDeltaMovement(d4, d5, d6);
@@ -1154,7 +1154,7 @@ index 67627bbf84f5aab2872f636b1dcb6728c8494147..5cf43c4d0ce6e3af5ea6c190db0c47c3
          if (this.jumping && this.isAffectedByFluids()) {
              double d7;
  
-@@ -3387,8 +3376,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3390,8 +3379,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
              this.noJumpDelay = 0;
          }
  
@@ -1163,7 +1163,7 @@ index 67627bbf84f5aab2872f636b1dcb6728c8494147..5cf43c4d0ce6e3af5ea6c190db0c47c3
          this.xxa *= 0.98F;
          this.zza *= 0.98F;
          this.updateFallFlying();
-@@ -3415,8 +3402,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3418,8 +3405,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
              this.travel(vec3d1);
          }
  
@@ -1172,7 +1172,7 @@ index 67627bbf84f5aab2872f636b1dcb6728c8494147..5cf43c4d0ce6e3af5ea6c190db0c47c3
          if (!this.level().isClientSide && !this.isDeadOrDying() && !freezeLocked) { // Paper - Freeze Tick Lock API
              int i = this.getTicksFrozen();
  
-@@ -3433,15 +3418,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3436,15 +3421,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
              this.hurt(this.damageSources().freeze(), 1.0F);
          }
  

patches/server/0018-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch

@@ -40,10 +40,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/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5cf43c4d0ce6e3af5ea6c190db0c47c35b0a350c..59db3933d1abb161b7ea6b9164653e96255cb545 100644
+index 9a56be04cb60ec09d145185aa07ef74ae4cd6f9b..739937204751c0922567e104a6ffabd00c676fe6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3640,7 +3640,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3643,7 +3643,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
              Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
  
              // Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists

patches/server/0030-Cache-on-climbable-check.patch

@@ -31,7 +31,7 @@ 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/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 66b562e3f16050ebee50b8b440b48c4e3c7049d3..f86cb887d2cc3ae38c8d38675c3ac5ff2992242d 100644
+index 739937204751c0922567e104a6ffabd00c676fe6..daa48daeacb3114526946296b77eae820bb42656 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -143,7 +143,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -42,7 +42,7 @@ index 66b562e3f16050ebee50b8b440b48c4e3c7049d3..f86cb887d2cc3ae38c8d38675c3ac5ff
  
  public abstract class LivingEntity extends Entity implements Attackable {
  
-@@ -1970,6 +1969,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1973,6 +1972,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
          return this.lastClimbablePos;
      }
  
@@ -64,7 +64,7 @@ index 66b562e3f16050ebee50b8b440b48c4e3c7049d3..f86cb887d2cc3ae38c8d38675c3ac5ff
          if (this.isSpectator()) {
              return false;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index d4da9ec6e00bb92b70598ee9a0d0ca5816562378..713f62b7bfe290b1eb0eda6e3acc1d3583029aa6 100644
+index eda7f0bb42f7269676d5d2193e1155912ede9920..0d04d7f9a9df7140cc35534a3f301f2815faed51 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -292,7 +292,7 @@ public class ActivationRange

patches/server/0044-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 774e79681c910dc036238b4a913fa6ecaf09a94f..3097e021e89bf04e9cf18dae1f9be8a089d29743 100644
+index a35e8a5a66bcd1235edbf2ba1a245956f90117f7..4a7cb5e5be6c9f2fbadafe86bbf962e6697afce8 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -63,6 +63,7 @@ tasks.withType<JavaCompile> {
+@@ -64,6 +64,7 @@ tasks.withType<JavaCompile> {
      compilerArgs.add("-Xlint:-module")
      compilerArgs.add("-Xlint:-removal")
      compilerArgs.add("-Xlint:-dep-ann")
@@ -24,7 +24,7 @@ index 774e79681c910dc036238b4a913fa6ecaf09a94f..3097e021e89bf04e9cf18dae1f9be8a0
  }
  // Gale end - hide irrelevant compilation warnings
  
-@@ -187,6 +188,7 @@ fun TaskContainer.registerRunTask(
+@@ -188,6 +189,7 @@ fun TaskContainer.registerRunTask(
      jvmArgs("--enable-preview")
      jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
      // Gale end - enable virtual threads for development runs

patches/server/0048-Make-chat-order-verification-configurable.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/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bb68e65813f2f471add275023f53430c05170813..9b028f8a5d0bcda9ea1bc28b65587627e31e78b1 100644
+index 1e047f451e35e48c2ac43076d1c6be6458a6a8f8..9cce018d0d187a299fb8275b5e0db81d79b91fec 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2366,6 +2366,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2369,6 +2369,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      }
  
      private boolean updateChatOrder(Instant timestamp) {

patches/server/0054-Do-not-process-chat-commands-before-player-has-joine.patch

@@ -13,7 +13,7 @@ As part of: EmpireCraft (https://github.com/starlis/empirecraft)
 Licensed under: MIT (https://opensource.org/licenses/MIT)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f77f4cbdca0b22e0c24acbf08425e2e83ddef449..e7ec98be67ab50c06d90a1bccd023fcd2a2fee93 100644
+index 8badf1d6239eca7e48819860ada3a1ce21c3b4db..c3076b07077873a852c8a59219bd6aa74f2b9212 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -270,6 +270,7 @@ public class ServerPlayer extends Player {
@@ -25,10 +25,10 @@ index f77f4cbdca0b22e0c24acbf08425e2e83ddef449..e7ec98be67ab50c06d90a1bccd023fcd
      // CraftBukkit end
      public boolean isRealPlayer; // Paper
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9b028f8a5d0bcda9ea1bc28b65587627e31e78b1..ae50f9e62f1275d0cff6f017ec23e4ebcad46a1d 100644
+index 9cce018d0d187a299fb8275b5e0db81d79b91fec..996810340723f9a86f2f8f96d2c7a77fb4bf5e8e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2343,6 +2343,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2346,6 +2346,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
                  this.send(new ClientboundSystemChatPacket(PaperAdventure.asAdventure(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED)), false)); // Paper - Adventure
                  return Optional.empty();
@@ -40,7 +40,7 @@ index 9b028f8a5d0bcda9ea1bc28b65587627e31e78b1..ae50f9e62f1275d0cff6f017ec23e4eb
                  this.player.resetLastActionTime();
                  return optional;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 683b5d78f9e3dc34e40c54683f64be32317797ac..e0e27beebffdbb8fa534899b451cc59f275faef0 100644
+index 8547e7ff2f1f5b7701fb0f3c3010c14601a5f83e..3d6dd50625a61fa2dccc7ea71e1913733dddf801 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -342,6 +342,8 @@ public abstract class PlayerList {

patches/server/0056-Do-not-log-empty-message-warnings.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/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ae50f9e62f1275d0cff6f017ec23e4ebcad46a1d..aeeda04840eb8f7b1c05456acecbf9f81fcef54d 100644
+index 996810340723f9a86f2f8f96d2c7a77fb4bf5e8e..1b6f49bf945f037b6950b3ca865e27520b2b0148 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -185,6 +185,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;
@@ -18,7 +18,7 @@ index ae50f9e62f1275d0cff6f017ec23e4ebcad46a1d..aeeda04840eb8f7b1c05456acecbf9f8
  import org.galemc.gale.configuration.GaleGlobalConfiguration;
  import org.slf4j.Logger;
  
-@@ -2555,7 +2556,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2558,7 +2559,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // CraftBukkit start
          String s = message.signedContent();
          if (s.isEmpty()) {

patches/server/0062-Do-not-log-out-of-order-message-warnings.patch

@@ -7,10 +7,10 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index aeeda04840eb8f7b1c05456acecbf9f81fcef54d..fcf395497593704858439f7f9ca8b46b699c42df 100644
+index 1b6f49bf945f037b6950b3ca865e27520b2b0148..a2781f6fd62486b03b031f230a63294c2f680f0e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2333,7 +2333,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2336,7 +2336,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
      private Optional<LastSeenMessages> tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) {
          if (!this.updateChatOrder(timestamp)) {

patches/server/0067-Fix-legacy-colors-in-console.patch

@@ -1,144 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martijn Muijsers <martijnmuijsers@live.nl>
-Date: Tue, 29 Nov 2022 21:03:47 +0100
-Subject: [PATCH] Fix legacy colors in console
-
-License: MIT (https://opensource.org/licenses/MIT)
-Gale - https://galemc.org
-
-This patch is based on the following patch:
-"Fix legacy colors in console"
-By: BillyGalbreath <blake.galbreath@gmail.com>
-As part of: Purpur (https://github.com/PurpurMC/Purpur)
-Licensed under: MIT (https://opensource.org/licenses/MIT)
-
-* Purpur copyright *
-
-MIT License
-
-Copyright (c) 2019-2022 PurpurMC
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-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/io/papermc/paper/console/HexFormattingConverter.java b/src/main/java/io/papermc/paper/console/HexFormattingConverter.java
-index b9922b07cb105618390187d98acdf89e728e1f5a..a66d202749f243f6752df5027cb7c82f6132992a 100644
---- a/src/main/java/io/papermc/paper/console/HexFormattingConverter.java
-+++ b/src/main/java/io/papermc/paper/console/HexFormattingConverter.java
-@@ -17,6 +17,7 @@ import org.apache.logging.log4j.core.pattern.PatternFormatter;
- import org.apache.logging.log4j.core.pattern.PatternParser;
- import org.apache.logging.log4j.util.PerformanceSensitive;
- import org.apache.logging.log4j.util.PropertiesUtil;
-+import org.galemc.gale.configuration.GaleGlobalConfiguration;
- 
- import java.util.List;
- import java.util.regex.Matcher;
-@@ -38,6 +39,7 @@ public final class HexFormattingConverter extends LogEventPatternConverter {
-     private static final String ANSI_RESET = "\u001B[m";
- 
-     private static final char COLOR_CHAR = 0x7f;
-+    private static final char LEGACY_CHAR = 0xa7; // Gale - Purpur - fix legacy colors in console
-     public static final LegacyComponentSerializer SERIALIZER = LegacyComponentSerializer.builder()
-         .hexColors()
-         .flattener(PaperAdventure.FLATTENER)
-@@ -49,6 +51,10 @@ public final class HexFormattingConverter extends LogEventPatternConverter {
-     private static final String RESET_RGB_ANSI = ANSI_RESET + RGB_ANSI;
-     private static final Pattern NAMED_PATTERN = Pattern.compile(COLOR_CHAR + "[0-9a-fk-orA-FK-OR]");
-     private static final Pattern RGB_PATTERN = Pattern.compile(COLOR_CHAR + "#([0-9a-fA-F]){6}");
-+    // Gale start - Purpur - fix legacy colors in console
-+    private static final Pattern LEGACY_RGB_PATTERN = Pattern.compile(LEGACY_CHAR + "x((" + LEGACY_CHAR + "[0-9a-fA-F]){6})");
-+    private static final Pattern LEGACY_PATTERN = Pattern.compile(LEGACY_CHAR + "([0-9a-fk-orxA-FK-ORX])");
-+    // Gale end - Purpur - fix legacy colors in console
- 
-     private static final String[] RGB_ANSI_CODES = new String[]{
-         formatHexAnsi(NamedTextColor.BLACK),         // Black §0
-@@ -134,7 +140,27 @@ public final class HexFormattingConverter extends LogEventPatternConverter {
-     }
- 
-     private static String convertRGBColors(final String input) {
--        return RGB_PATTERN.matcher(input).replaceAll(result -> {
-+        // Gale start - Purpur - fix legacy colors in console - lets just shove this back in place
-+        String toConvert;
-+        if (fixLegacyColors()) {
-+            Matcher matcher = LEGACY_RGB_PATTERN.matcher(input);
-+            StringBuilder buffer = new StringBuilder();
-+            while (matcher.find()) {
-+                String s = matcher.group().replace(String.valueOf(LEGACY_CHAR), "").replace('x', '#');
-+                int hex = Integer.decode(s);
-+                int red = (hex >> 16) & 0xFF;
-+                int green = (hex >> 8) & 0xFF;
-+                int blue = hex & 0xFF;
-+                String replacement = String.format(RGB_ANSI, red, green, blue);
-+                matcher.appendReplacement(buffer, replacement);
-+            }
-+            matcher.appendTail(buffer);
-+            toConvert = buffer.toString();
-+        } else {
-+            toConvert = input;
-+        }
-+        return RGB_PATTERN.matcher(toConvert).replaceAll(result -> {
-+            // Gale end - Purpur - fix legacy colors in console - lets just shove this back in place
-             final int hex = Integer.decode(result.group().substring(1));
-             return formatHexAnsi(hex);
-         });
-@@ -152,10 +178,18 @@ public final class HexFormattingConverter extends LogEventPatternConverter {
-     }
- 
-     private static String stripRGBColors(final String input) {
--        return RGB_PATTERN.matcher(input).replaceAll("");
-+        // Gale start - Purpur - fix legacy colors in console
-+        String removedRGB = RGB_PATTERN.matcher(input).replaceAll("");
-+        return fixLegacyColors() ? LEGACY_RGB_PATTERN.matcher(removedRGB).replaceAll("") : removedRGB;
-+        // Gale end - Purpur - fix legacy colors in console
-     }
- 
-     static void format(String content, StringBuilder result, int start, boolean ansi) {
-+        // Gale start - Purpur - fix legacy colors in console
-+        if (fixLegacyColors()) {
-+            content = LEGACY_PATTERN.matcher(content).replaceAll(COLOR_CHAR + "$1");
-+        }
-+        // Gale end - Purpur - fix legacy colors in console
-         int next = content.indexOf(COLOR_CHAR);
-         int last = content.length() - 1;
-         if (next == -1 || next == last) {
-@@ -210,4 +244,13 @@ public final class HexFormattingConverter extends LogEventPatternConverter {
-         return new HexFormattingConverter(formatters, strip);
-     }
- 
-+    // Gale start - Purpur - fix legacy colors in console
-+    private static boolean fixLegacyColors() {
-+        try {
-+            return GaleGlobalConfiguration.get().logToConsole.legacyColors;
-+        } catch (NullPointerException ignored) {}
-+        return false;
-+    }
-+    // Gale end - Purpur - fix legacy colors in console
-+
- }
-diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 882830dd0bddb81e1a592cdd089d4340beb946a7..f4f6f59af9ae02748763b82f2c2ae5da90737749 100644
---- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -114,6 +114,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
-     public LogToConsole logToConsole;
-     public class LogToConsole extends ConfigurationPart.Post { // Gale - EMC - softly log invalid pool element errors
- 
-+        public boolean legacyColors = true; // Gale - Purpur - fix legacy colors in console
-         public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
-         public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements
-         public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks

patches/server/0079-Make-logging-login-locations-configurable.patch

@@ -13,7 +13,7 @@ As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index efc958959b772312acfbcfb0cf52c6aa6be77fb2..6deac057bae3fe80bbdd39fc6151ee66e754c71e 100644
+index 77e6d38d145c98422a41a310337258898c3afb1f..603260943ecd5706b6ed574973287d6d3ad4bbb7 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -480,7 +480,13 @@ public abstract class PlayerList {
@@ -31,10 +31,10 @@ index efc958959b772312acfbcfb0cf52c6aa6be77fb2..6deac057bae3fe80bbdd39fc6151ee66
  
      public void updateEntireScoreboard(ServerScoreboard scoreboard, ServerPlayer player) {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index f4f6f59af9ae02748763b82f2c2ae5da90737749..599c921e30e84c7145340f575d8de1b1d71d9331 100644
+index 882830dd0bddb81e1a592cdd089d4340beb946a7..c9ad1e5371b7d6f7de868cabebb8880052e59f64 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -120,6 +120,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -119,6 +119,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
          public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks
          public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes
          public boolean legacyMaterialInitialization = false; // Gale - Purpur - do not log legacy Material initialization

patches/server/0080-Reduce-array-allocations.patch

@@ -412,7 +412,7 @@ index dae36c6452ccd57a436dd918547b64d59957ab0a..f06cafd80d7c027ca97e50bcb45ad520
          OptionSpec<Integer> optionspec11 = optionparser.accepts("port").withRequiredArg().ofType(Integer.class).defaultsTo(-1, new Integer[0]);
          OptionSpec<String> optionspec12 = optionparser.accepts("serverId").withRequiredArg();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a6d5dd36d297c976ad3302ae7c3c2080c978f68d..850f2299595e081cbac459304e8c52d94d90f6f4 100644
+index 745727701051ebc8280ab61161e7b652f6abee8a..53aa1cb62794ea481c37587b2d424f188130764c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -50,6 +50,8 @@ import java.util.stream.Collectors;
@@ -469,7 +469,7 @@ index efbc8483a51c5272ca81747c82dc65e7f0f5c232..9879599c38db4f3332c347b6b0c26034
          return ret;
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fcf395497593704858439f7f9ca8b46b699c42df..574c8a2680c66d9e8bc14b1128652f1f4d16210b 100644
+index a2781f6fd62486b03b031f230a63294c2f680f0e..2166fb9e993394f8298c02b0eddd5f773c2c2182 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -29,6 +29,8 @@ import java.util.function.UnaryOperator;
@@ -531,7 +531,7 @@ index fcf395497593704858439f7f9ca8b46b699c42df..574c8a2680c66d9e8bc14b1128652f1f
              return;
          }
          // Paper end
-@@ -3300,7 +3298,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3303,7 +3301,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // Paper start
          if (!org.bukkit.Bukkit.isPrimaryThread()) {
              if (this.recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {
@@ -578,7 +578,7 @@ index 2ff578e4a953ffcf5176815ba8e3f06f73499989..a436ef49325c9cae1008d5763373cce8
          final String s;
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6deac057bae3fe80bbdd39fc6151ee66e754c71e..ddde03a81d7a39188ac26c16658301e138356453 100644
+index 603260943ecd5706b6ed574973287d6d3ad4bbb7..4bab4dced684a0e22e97d72d517ad4abfa4e9628 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -27,6 +27,8 @@ import java.util.UUID;
@@ -679,10 +679,10 @@ index 97ff19efa0b3943ccb7a6e02cba6ed2fea61adac..b2ae2bd8bd4ff3cb6457e8c08172e348
      private EquipmentSlot(EquipmentSlot.Type type, int entityId, int armorStandId, String name) {
          this.type = type;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1040e76c829521b214e5a96fb41ee60e223641d3..1016a70c2b468463cb74aa6bbfe3aa65eb297786 100644
+index 699d4e17cf3a0f688ce07676afb1a86b5e180eef..12a8a375714b1ccb7c66121975a7d865183bbb19 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3106,7 +3106,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3109,7 +3109,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      @Nullable
      private Map<EquipmentSlot, ItemStack> collectEquipmentChanges() {
          Map<EquipmentSlot, ItemStack> map = null;
@@ -745,7 +745,7 @@ index 25ed5571b24e590bc95056020d84496492b53298..087acc992a83b2a7e40a0e24f00e283c
  
          for (int j = 0; j < i; ++j) {
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index b367ec1feaccbd67e9e28c0d0515e163f37135fe..7ca7834a1a0593a6d1eb105e215784100076d421 100644
+index adb7220be617d6d9f2cdd7fbe4fa2dd24cc7d142..99c0ec4b3bff1ff41192d3acc9d58eb65ffb72c2 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -1014,7 +1014,7 @@ public final class ItemStack {
@@ -961,19 +961,19 @@ index 6827979a5b270ced53b46ecb9eff548727dadb81..8cecb6eddee0c3cafaecc3cc4d7cf99f
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/WeakCollection.java b/src/main/java/org/bukkit/craftbukkit/util/WeakCollection.java
-index 049d750d3af991dd14ac8cf644330404e74b2151..f0b3e5307226ebcad45edcec3ccfe363c7dbbf34 100644
+index bbacf58740f3faea0d555e4012fe2b15fb46ed50..4c8e9a70fd40dbd519a5525c3a3ad90e9f3f3401 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/WeakCollection.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/WeakCollection.java
-@@ -5,6 +5,8 @@ import java.util.ArrayList;
+@@ -7,6 +7,8 @@ import java.util.Collection;
- import java.util.Collection;
  import java.util.Iterator;
  import java.util.NoSuchElementException;
-+
-+import me.titaniumtown.ArrayConstants;
- import org.apache.commons.lang.Validate;
  
++import me.titaniumtown.ArrayConstants;
++
  public final class WeakCollection<T> implements Collection<T> {
-@@ -166,7 +168,7 @@ public final class WeakCollection<T> implements Collection<T> {
+     static final Object NO_VALUE = new Object();
+     private final Collection<WeakReference<T>> collection;
+@@ -164,7 +166,7 @@ public final class WeakCollection<T> implements Collection<T> {
  
      @Override
      public Object[] toArray() {

patches/server/0081-Optimize-sun-burn-tick.patch

@@ -13,7 +13,7 @@ As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index eb395d6498f3f43c20d371efd8e1f410400f1f2a..220880d8a723724174fe948765e108ecaf24872b 100644
+index 94b95080651350845932e2b362138d42c32f2741..21dd00eaac3aad121e71fa16d4587ba157f3b090 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -293,7 +293,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0094-Check-frozen-ticks-before-landing-block.patch

@@ -13,7 +13,7 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
 Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1016a70c2b468463cb74aa6bbfe3aa65eb297786..da2b72bdcd2ec7e1992a828c4d5a543b113a2592 100644
+index 12a8a375714b1ccb7c66121975a7d865183bbb19..1f31b9bb36274a53b3594e0564f97e1275544b9c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -584,11 +584,10 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0102-Skip-entity-move-if-movement-is-zero.patch

@@ -13,7 +13,7 @@ As part of: VMP (https://github.com/RelativityMC/VMP-fabric)
 Licensed under: MIT (https://opensource.org/licenses/MIT)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 220880d8a723724174fe948765e108ecaf24872b..88e414d74a6b144b7c3db5bcd3a3d9841b9c051d 100644
+index 21dd00eaac3aad121e71fa16d4587ba157f3b090..9a08ad4e0db5ce299b1538160bfb35424016b4a5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -302,6 +302,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0107-Hide-flames-on-entities-with-fire-resistance.patch

@@ -13,7 +13,7 @@ As part of: Slice (https://github.com/Cryptite/Slice)
 Licensed under: MIT (https://opensource.org/licenses/MIT)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 88e414d74a6b144b7c3db5bcd3a3d9841b9c051d..b30e7c2fe1d9247a3aa38e9d2b50f768181c26f8 100644
+index 9a08ad4e0db5ce299b1538160bfb35424016b4a5..de3e85da8dc4750cfa9bd2aede01fd8e42ec3d4f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -878,7 +878,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0111-Spread-out-sending-all-player-info.patch

@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ddde03a81d7a39188ac26c16658301e138356453..25566ec9b692499b30b16bf5c9c5436936c5ca9b 100644
+index 4bab4dced684a0e22e97d72d517ad4abfa4e9628..6fff31722af772a84f579c0a36e90f0faaf70e12 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -15,6 +15,8 @@ import java.net.SocketAddress;

patches/server/0112-Optimize-player-list-for-sending-player-info.patch

@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 25566ec9b692499b30b16bf5c9c5436936c5ca9b..1678492a2e65bea22e9c10d6680218160dda2c2d 100644
+index 6fff31722af772a84f579c0a36e90f0faaf70e12..d83e0bb4beb8e5ff596e587333f6b39d35f903e2 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1041,14 +1041,18 @@ public abstract class PlayerList {

patches/server/0114-Send-multiple-keep-alive-packets.patch

@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 574c8a2680c66d9e8bc14b1128652f1f4d16210b..31dc612cd8f84fec4138b5d9ed4ac093c3e202ce 100644
+index 2166fb9e993394f8298c02b0eddd5f773c2c2182..93b8c00c16b26f4b76f35d1aa32560375097aef4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -7,6 +7,8 @@ import com.mojang.brigadier.StringReader;
@@ -91,7 +91,7 @@ index 574c8a2680c66d9e8bc14b1128652f1f4d16210b..31dc612cd8f84fec4138b5d9ed4ac093
          if (this.keepAlivePending) {
              if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                  ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
-@@ -3465,6 +3486,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3468,6 +3489,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
      @Override
      public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
@@ -109,7 +109,7 @@ index 574c8a2680c66d9e8bc14b1128652f1f4d16210b..31dc612cd8f84fec4138b5d9ed4ac093
          if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
              int i = (int) (Util.getMillis() - this.keepAliveTime);
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 599c921e30e84c7145340f575d8de1b1d71d9331..ef95ee4238c6da237e939c06c63cd8666a863ac5 100644
+index c9ad1e5371b7d6f7de868cabebb8880052e59f64..ead1ae2db1c2ad118a50ab3a2c1216bd3bb5eae8 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 @@ -109,6 +109,13 @@ public class GaleGlobalConfiguration extends ConfigurationPart {

patches/server/0115-Make-slow-login-timeout-configurable.patch

@@ -31,7 +31,7 @@ index a436ef49325c9cae1008d5763373cce8c6680e5f..5b7c12db86be64433c65e31e3ecc0b44
          }
  
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index ef95ee4238c6da237e939c06c63cd8666a863ac5..7dcb82b0784816a84557a3842fe6f5f13ec3d5ff 100644
+index ead1ae2db1c2ad118a50ab3a2c1216bd3bb5eae8..1b7ff78c12bc9eb04bc0f74b21ccdbbec6dc54c4 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 @@ -74,6 +74,20 @@ public class GaleGlobalConfiguration extends ConfigurationPart {

patches/server/0116-Make-max-interaction-distance-configurable.patch

@@ -20,7 +20,7 @@ index 1635fee928d64f4d2c336dca6675ed4641918830..d65b9d2d9070d8dee2c144c9b37d6605
              this.debugLogging(pos, false, sequence, "too far");
          } else if (pos.getY() >= worldHeight) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 31dc612cd8f84fec4138b5d9ed4ac093c3e202ce..79dba3796df83d0127db6e29f38a35e1d3289724 100644
+index 93b8c00c16b26f4b76f35d1aa32560375097aef4..8d90209a01020d44626f56e2cb0dd5eca300f699 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -254,7 +254,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -46,7 +46,7 @@ index 31dc612cd8f84fec4138b5d9ed4ac093c3e202ce..79dba3796df83d0127db6e29f38a35e1
      @Override
      public void tick() {
          if (this.ackBlockChangesUpTo > -1) {
-@@ -1966,7 +1973,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1969,7 +1976,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              BlockPos blockposition = movingobjectpositionblock.getBlockPos();
              Vec3 vec3d1 = Vec3.atCenterOf(blockposition);
  
@@ -55,7 +55,7 @@ index 31dc612cd8f84fec4138b5d9ed4ac093c3e202ce..79dba3796df83d0127db6e29f38a35e1
                  Vec3 vec3d2 = vec3d.subtract(vec3d1);
                  double d0 = 1.0000001D;
  
-@@ -2825,7 +2832,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2828,7 +2835,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
              AABB axisalignedbb = entity.getBoundingBox();
  

patches/server/0117-Load-portal-destination-chunk-before-entity-teleport.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/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b30e7c2fe1d9247a3aa38e9d2b50f768181c26f8..a3243bba3a1afe23a2c4bf3ecb01f5fcf07837ce 100644
+index de3e85da8dc4750cfa9bd2aede01fd8e42ec3d4f..6f1bcfb656ed5bc8ba9d8afab1ec8b8ee6263754 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3601,6 +3601,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0119-Don-t-load-chunks-to-activate-climbing-entities.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/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a3243bba3a1afe23a2c4bf3ecb01f5fcf07837ce..74ec0729f052c6c3119e25a8891a8f7e6a77eaf5 100644
+index 6f1bcfb656ed5bc8ba9d8afab1ec8b8ee6263754..358a6aa87df1bbeb8ade06c24e9bd222a99262f0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4519,6 +4519,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -28,10 +28,10 @@ index a3243bba3a1afe23a2c4bf3ecb01f5fcf07837ce..74ec0729f052c6c3119e25a8891a8f7e
          return this.chunkPosition;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index da2b72bdcd2ec7e1992a828c4d5a543b113a2592..c48b5750ebaa8852692ddb8b0873697361e885c9 100644
+index 1f31b9bb36274a53b3594e0564f97e1275544b9c..07ab60405dfbef46e74911a750ab0a9d067111c9 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1986,19 +1986,43 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1989,19 +1989,43 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
      public boolean onClimbableCached() {
          if (!this.blockPosition().equals(this.lastClimbingPosition)) {

patches/server/0120-Broadcast-crit-animations-as-the-entity-being-critte.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/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e7ec98be67ab50c06d90a1bccd023fcd2a2fee93..6bbb894b26c2ed3844aa5a6ea809fea74538468a 100644
+index c3076b07077873a852c8a59219bd6aa74f2b9212..0e765c1fb7b93905b7aff8f03fcabba7dc2d8cfa 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1908,12 +1908,18 @@ public class ServerPlayer extends Player {

patches/server/0121-Ignore-null-legacy-structure-data.patch

@@ -46,7 +46,7 @@ index cc7222cc7e53e8ae693e4e94ad53391db7a663c4..9d1d7033fdd2ae65b8fd323e9199b9d5
                          continue;
                      }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 7dcb82b0784816a84557a3842fe6f5f13ec3d5ff..275bfc7d54d89e10749e14522a790f2878d99c2c 100644
+index 1b7ff78c12bc9eb04bc0f74b21ccdbbec6dc54c4..2209468501f1b1bcf01c1944c696aeee27af2ba1 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 @@ -88,6 +88,19 @@ public class GaleGlobalConfiguration extends ConfigurationPart {

patches/server/0122-Don-t-double-save-stored-user-lists.patch

@@ -31,7 +31,7 @@ index 935dac757280731bfeb0a8f033cbe315ecac46da..a9786790620d4100b52fafc15933d312
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftIpBanList.java b/src/main/java/org/bukkit/craftbukkit/CraftIpBanList.java
-index 30f2ddff4108e92eaac50317bdd9ef4eb25ec085..027855cc99b0fad7a8d3967b6c0b2037b3a52574 100644
+index 5a7d884bcad7b30109567c1eff816a31c1701b06..6955072875cd3034a3b1ad8c758bf8ac19972306 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftIpBanList.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftIpBanList.java
 @@ -41,12 +41,6 @@ public class CraftIpBanList implements org.bukkit.BanList {
@@ -63,7 +63,7 @@ index 126968d557263b3efddc9d53d0f8f436a401cf78..3854c93794d27ecd0331105106b104b1
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftProfileBanList.java b/src/main/java/org/bukkit/craftbukkit/CraftProfileBanList.java
-index 6e2047f1b45799c7a1ddfdcd24d76e6e12f91e4b..a31d126590505c00d1a4c0fbb9eb327ec87f7895 100644
+index 535a571d140dd5932dbd503c540f988c421f0627..cad7307e3e00f672b768c563bfcd06dd9dfcb53b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftProfileBanList.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftProfileBanList.java
 @@ -54,12 +54,6 @@ public class CraftProfileBanList implements org.bukkit.BanList {

patches/server/0125-Do-not-place-player-in-world-if-kicked-before-being-.patch

@@ -14,7 +14,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/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1678492a2e65bea22e9c10d6680218160dda2c2d..88d350ecfb16e34d6710ad7b17ce7438e4dbceb9 100644
+index d83e0bb4beb8e5ff596e587333f6b39d35f903e2..697bd3a7c0ab1e941355a818bffe85bdb28a70db 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -269,6 +269,13 @@ public abstract class PlayerList {

patches/server/0126-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 e9412757b1b8cdee878b5a210ad7d9b008e9d710..be250f95e1ebf61e74b3c025f2c90d48c75aad76 100644
+index aafe7157fe5be8638f9e1040dce9f62092040396..a8ca4a1f7c0542ac6abb869b68263bedd0c5a1e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -42,6 +42,9 @@ import java.util.logging.Level;
@@ -26,7 +26,7 @@ index e9412757b1b8cdee878b5a210ad7d9b008e9d710..be250f95e1ebf61e74b3c025f2c90d48
  import net.minecraft.advancements.Advancement;
  import net.minecraft.commands.CommandSourceStack;
  import net.minecraft.commands.Commands;
-@@ -277,6 +280,7 @@ public final class CraftServer implements Server {
+@@ -276,6 +279,7 @@ public final class CraftServer implements Server {
      protected final DedicatedServer console;
      protected final DedicatedPlayerList playerList;
      private final Map<String, World> worlds = new LinkedHashMap<String, World>();
@@ -34,7 +34,7 @@ index e9412757b1b8cdee878b5a210ad7d9b008e9d710..be250f95e1ebf61e74b3c025f2c90d48
      private final Map<Class<?>, Registry<?>> registries = new HashMap<>();
      private YamlConfiguration configuration;
      private YamlConfiguration commandsConfiguration;
-@@ -1339,6 +1343,7 @@ public final class CraftServer implements Server {
+@@ -1340,6 +1344,7 @@ public final class CraftServer implements Server {
              this.getLogger().log(Level.SEVERE, null, ex);
          }
  
@@ -42,7 +42,7 @@ index e9412757b1b8cdee878b5a210ad7d9b008e9d710..be250f95e1ebf61e74b3c025f2c90d48
          this.worlds.remove(world.getName().toLowerCase(java.util.Locale.ENGLISH));
          this.console.removeLevel(handle);
          return true;
-@@ -1357,12 +1362,7 @@ public final class CraftServer implements Server {
+@@ -1358,12 +1363,7 @@ public final class CraftServer implements Server {
  
      @Override
      public World getWorld(UUID uid) {
@@ -56,7 +56,7 @@ index e9412757b1b8cdee878b5a210ad7d9b008e9d710..be250f95e1ebf61e74b3c025f2c90d48
      }
  
      // Paper start
-@@ -1380,6 +1380,7 @@ public final class CraftServer implements Server {
+@@ -1381,6 +1381,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/0128-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 be250f95e1ebf61e74b3c025f2c90d48c75aad76..8ff6771e6ce1d8b9929aaf220e8eaee2243218c6 100644
+index a8ca4a1f7c0542ac6abb869b68263bedd0c5a1e1..546dc3c3fb6ce94665daeea7e3c05af54f4111e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2728,6 +2728,25 @@ public final class CraftServer implements Server {
+@@ -2745,6 +2745,25 @@ public final class CraftServer implements Server {
          };
      }
  

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

@@ -59,10 +59,10 @@ index fa56cd09102a89692b42f1d14257990508c5c720..fac07dda413002c12276131efbe4ee38
          setListData(vector);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 850f2299595e081cbac459304e8c52d94d90f6f4..6f7b2e788cd9e0e74f74a83706d30ab98a032507 100644
+index 53aa1cb62794ea481c37587b2d424f188130764c..8f2f71821e10c7ead30ae04854ccd203fb63a1fd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1028,6 +1028,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1026,6 +1026,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
      private long lastTick = 0;
      private long catchupTime = 0;
@@ -70,7 +70,7 @@ index 850f2299595e081cbac459304e8c52d94d90f6f4..6f7b2e788cd9e0e74f74a83706d30ab9
      public final RollingAverage tps1 = new RollingAverage(60);
      public final RollingAverage tps5 = new RollingAverage(60 * 5);
      public final RollingAverage tps15 = new RollingAverage(60 * 15);
-@@ -1128,6 +1129,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1126,6 +1127,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  {
                      final long diff = curTime - tickSection;
                      java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);
@@ -79,10 +79,10 @@ index 850f2299595e081cbac459304e8c52d94d90f6f4..6f7b2e788cd9e0e74f74a83706d30ab9
                      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 8ff6771e6ce1d8b9929aaf220e8eaee2243218c6..3ed6142ab674d1212c1005a4cd3b6e3db3252da6 100644
+index 546dc3c3fb6ce94665daeea7e3c05af54f4111e3..ed88860bd93244beff4540896e7420be44826cb8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2728,8 +2728,27 @@ public final class CraftServer implements Server {
+@@ -2745,8 +2745,27 @@ public final class CraftServer implements Server {
          };
      }
  

patches/server/0130-Measure-last-tick-time.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/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6f7b2e788cd9e0e74f74a83706d30ab98a032507..b0a7dfeb1d2bae669410ffcce256645ab314b465 100644
+index 8f2f71821e10c7ead30ae04854ccd203fb63a1fd..22891d5c1787c5cdc5d307867ac89196c2b4a7a7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1078,6 +1078,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1076,6 +1076,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      public static volatile RuntimeException chunkSystemCrash; // Paper - rewrite chunk system
  
@@ -38,7 +38,7 @@ index 6f7b2e788cd9e0e74f74a83706d30ab98a032507..b0a7dfeb1d2bae669410ffcce256645a
      protected void runServer() {
          try {
              long serverStartTime = Util.getNanos(); // Paper
-@@ -1145,7 +1150,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1143,7 +1148,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  //MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit // Paper - don't overwrite current tick time
                  lastTick = curTime;
                  this.nextTickTime += 50L;
@@ -48,7 +48,7 @@ index 6f7b2e788cd9e0e74f74a83706d30ab98a032507..b0a7dfeb1d2bae669410ffcce256645a
                  this.mayHaveDelayedTasks = true;
                  this.delayedTasksMaxNextTickTime = Math.max(Util.getMillis() + 50L, this.nextTickTime);
                  this.waitUntilNextTick();
-@@ -1258,9 +1265,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1256,9 +1263,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      protected void waitUntilNextTick() {
          //this.executeAll(); // Paper - move this into the tick method for timings

patches/server/0131-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 3ed6142ab674d1212c1005a4cd3b6e3db3252da6..226add5ee9fdb32e179a3ac42a277fed728934bf 100644
+index ed88860bd93244beff4540896e7420be44826cb8..4a7ed68b10bb09eb801c52871e47ca55cec46363 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3027,4 +3027,22 @@ public final class CraftServer implements Server {
+@@ -3044,4 +3044,22 @@ public final class CraftServer implements Server {
      }
  
      // Paper end

patches/server/0132-Show-last-tick-time-in-tps-command.patch

@@ -23,7 +23,7 @@ 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/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 275bfc7d54d89e10749e14522a790f2878d99c2c..a2a30e4e2dca73e3760e5993d8d02151edd05b32 100644
+index 2209468501f1b1bcf01c1944c696aeee27af2ba1..2ebf9c0d78fa9ede50ece4d5429b732e613ccf48 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 @@ -143,6 +143,14 @@ public class GaleGlobalConfiguration extends ConfigurationPart {

patches/server/0133-Increase-time-statistics-in-intervals.patch

@@ -87,7 +87,7 @@ index af8b5282df19c92c5f1394dc9d889012ce509f32..f070bd0eca4a55445f436c9520a89aab
  
          int i = 29999999;
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index a2a30e4e2dca73e3760e5993d8d02151edd05b32..48f6e114a3ead68d72f27f9d5572eacbc7613ac3 100644
+index 2ebf9c0d78fa9ede50ece4d5429b732e613ccf48..5c18b953893e2acfa9b670c91d4ff5a6020b398b 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 @@ -27,7 +27,29 @@ public class GaleGlobalConfiguration extends ConfigurationPart {

patches/server/0134-For-collision-check-has-physics-before-same-vehicle.patch

@@ -16,7 +16,7 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 74ec0729f052c6c3119e25a8891a8f7e6a77eaf5..b723929a164e0444bd3a9ee2dd8cac28b5b0cee0 100644
+index 358a6aa87df1bbeb8ade06c24e9bd222a99262f0..1f718138fe544004921b54a39023dcf62aa265d6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2110,8 +2110,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0135-Skip-negligible-planar-movement-multiplication.patch

@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b723929a164e0444bd3a9ee2dd8cac28b5b0cee0..9d5a1d6141414d5a886891867e2062ee11de0fd2 100644
+index 1f718138fe544004921b54a39023dcf62aa265d6..936813cb3cf8ad46c84f755b75e7e291cea5e15a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1239,9 +1239,19 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0136-Optimize-matching-item-checks.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/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 7ca7834a1a0593a6d1eb105e215784100076d421..6af4ae47a357d09ba9cba8248d5bd0da90b25916 100644
+index 99c0ec4b3bff1ff41192d3acc9d58eb65ffb72c2..a4b51ca1a778efa3f4208d18b2c93a6e733ed987 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -749,15 +749,15 @@ public final class ItemStack {

patches/server/0137-Reduce-RandomSource-instances.patch

@@ -26,7 +26,7 @@ index 1af5f4fde0d9d6c7d9dd32714a4e31b298d7564d..098828871f36ef8f9796456747977d7c
              double d1 = (double) (center.y - maxRange);
              double d2 = (double) (center.x + maxRange);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6bbb894b26c2ed3844aa5a6ea809fea74538468a..f4cc145f2670dee5893eeb1891b3fb8bfadd9b36 100644
+index 0e765c1fb7b93905b7aff8f03fcabba7dc2d8cfa..00ce8b78e35055da01a053cb0d4ed914d50acebc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -441,7 +441,7 @@ public class ServerPlayer extends Player {

patches/server/0138-Server-thread-priority-environment-variable.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/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b0a7dfeb1d2bae669410ffcce256645ab314b465..ecb42a8f9a8eb18d7fd3f828ece4ac8ebf4de0e0 100644
+index 22891d5c1787c5cdc5d307867ac89196c2b4a7a7..556fca5daf3de2c12a9b30ad7cf8c024ed9ca8ed 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -186,6 +186,8 @@ import co.aikar.timings.MinecraftTimings; // Paper
@@ -19,7 +19,7 @@ index b0a7dfeb1d2bae669410ffcce256645ab314b465..ecb42a8f9a8eb18d7fd3f828ece4ac8e
      private static MinecraftServer SERVER; // Paper
      public static final Logger LOGGER = LogUtils.getLogger();
      public static final net.kyori.adventure.text.logger.slf4j.ComponentLogger COMPONENT_LOGGER = net.kyori.adventure.text.logger.slf4j.ComponentLogger.logger(LOGGER.getName()); // Paper
-@@ -313,7 +315,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -311,7 +313,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          S s0 = serverFactory.apply(thread); // CraftBukkit - decompile error
  
          atomicreference.set(s0);