Updated Upstream (Paper)

2025-12-22 16:29:26 +00:00 · 2023-08-07 21:04:06 +02:00
parent 28e266d7d0
commit 32f84f5c53
24 changed files with 88 additions and 88 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=org.galemc.gale
 version=1.20.1-R0.1-SNAPSHOT

 mcVersion=1.20.1
-paperRef=6c7e3c519364ddf6c11d70e6d61cf6a00df650e0
+paperRef=d6d2b6f4e51b24867b609cf747ac6d8c6345c449

 org.gradle.caching=true
 org.gradle.parallel=true
--- a/patches/api/0002-Gale-configuration.patch
+++ b/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 6b72eccdcb6f75534a4267a1dd0a4cc2f39e917b..f0bd65cb60510a8b3014d902602c306657c75bfd 100644
+index 68206cf0178c26c0f528a1e14a5fb4e9ad410369..2e93d4c072ed0b67743820801537e20d4c95afe7 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2028,6 +2028,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2079,6 +2079,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
         {
             throw new UnsupportedOperationException("Not supported yet.");
         }
--- a/patches/api/0006-Player-canSee-by-entity-UUID.patch
+++ b/patches/api/0006-Player-canSee-by-entity-UUID.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/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 4f710a941954a3d94acabe2a83bee050ad1ff052..760e6f96d3c43d6ab3d4e2e147a3472724c9ec25 100644
+index 14c92390aeaeee518f43778ccd5fc820fdc62689..da3e990b2e888387736ffda4a6c9165c5d84248e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -5,6 +5,8 @@ import java.net.InetSocketAddress;
+@@ -7,6 +7,8 @@ import java.time.Instant;
 import java.util.Collection;
 import java.util.Date;
 import java.util.Map;
@@ -49,7 +49,7 @@ index 4f710a941954a3d94acabe2a83bee050ad1ff052..760e6f96d3c43d6ab3d4e2e147a34727
 import org.bukkit.BanEntry;
 import org.bukkit.DyeColor;
 import org.bukkit.Effect;
-@@ -1775,6 +1777,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1841,6 +1843,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
     @ApiStatus.Experimental
     public boolean canSee(@NotNull Entity entity);
 
--- a/patches/api/0007-Specific-interval-TPS-API.patch
+++ b/patches/api/0007-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 b243db56756c67cd2c41d7768898d01539f9260a..a177509cff1f66bc7f48488b9440e573a443c3b5 100644
+index f380a518bc444bfdfbbedf38805c7684e53a5629..6309009fca193e8ceda4b3bf66ad4652e77dd015 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2135,6 +2135,37 @@ public final class Bukkit {
+@@ -2187,6 +2187,37 @@ public final class Bukkit {
         return server.getTPS();
     }
 
@@ -49,10 +49,10 @@ index b243db56756c67cd2c41d7768898d01539f9260a..a177509cff1f66bc7f48488b9440e573
      * 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 f0bd65cb60510a8b3014d902602c306657c75bfd..d9bf9c7ad36f7b8d99342e43e7af81075c039431 100644
+index 2e93d4c072ed0b67743820801537e20d4c95afe7..a607520896041a48f2ffb75d4cb374d116fcf25c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1810,6 +1810,31 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1861,6 +1861,31 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
     @NotNull
     public double[] getTPS();
 
--- a/patches/api/0008-5-second-TPS-average.patch
+++ b/patches/api/0008-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 a177509cff1f66bc7f48488b9440e573a443c3b5..07194bd35c9a72586a5d4096354ec1f96f882116 100644
+index 6309009fca193e8ceda4b3bf66ad4652e77dd015..3bc5e4fda1551dc1c9e7220d8a5c488398b16d4f 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2135,8 +2135,30 @@ public final class Bukkit {
+@@ -2187,8 +2187,30 @@ public final class Bukkit {
         return server.getTPS();
     }
 
@@ -72,10 +72,10 @@ index a177509cff1f66bc7f48488b9440e573a443c3b5..07194bd35c9a72586a5d4096354ec1f9
      * 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 d9bf9c7ad36f7b8d99342e43e7af81075c039431..d8aed689e6f42798cc8a50919779f5be6f61d685 100644
+index a607520896041a48f2ffb75d4cb374d116fcf25c..32d7cad1e2cbf277e6430bf985ecfaf16935d615 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1810,8 +1810,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1861,8 +1861,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
     @NotNull
     public double[] getTPS();
 
--- a/patches/api/0009-Last-tick-time-API.patch
+++ b/patches/api/0009-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 07194bd35c9a72586a5d4096354ec1f96f882116..6523d1525c41892fd007d9bba00bc84bea299ca6 100644
+index 3bc5e4fda1551dc1c9e7220d8a5c488398b16d4f..cf5cae753357bbe82d280a5c83800be2bb83f299 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2711,6 +2711,20 @@ public final class Bukkit {
+@@ -2763,6 +2763,20 @@ public final class Bukkit {
     }
     // Paper end - Folia region threading API
 
@@ -48,10 +48,10 @@ index 07194bd35c9a72586a5d4096354ec1f96f882116..6523d1525c41892fd007d9bba00bc84b
     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 d8aed689e6f42798cc8a50919779f5be6f61d685..c4d45446b18268c822ee06ae4781f7909d02e04a 100644
+index 32d7cad1e2cbf277e6430bf985ecfaf16935d615..093ba28cc5ab0bf5ef4a9198c1231d160713dbe7 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2366,4 +2366,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2417,4 +2417,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      */
     boolean isOwnedByCurrentRegion(@NotNull Entity entity);
     // Paper end - Folia region threading API
--- a/patches/server/0006-Gale-branding-changes.patch
+++ b/patches/server/0006-Gale-branding-changes.patch
@@ -11,7 +11,7 @@ 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 690ce70b6869f340da001d2f844b36bcca72c002..ba6f5098de10b77d7fc911212ff7077f8774440d 100644
+index 81ff409e32d4c05ee69e6a6892c8c388ea0d7cc9..6827ccd77dbba737b80bd14456c54fc54f8058f2 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
@@ -88,7 +88,7 @@ tasks.jar {
@@ -222,10 +222,10 @@ index 3238cbcba567b1242c77e41f6b6f19a8d157fb4e..6cf49bdf5c337213a474627bc1771ccb
 
     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 a05c1bc8874ef5e380544a6a344c848e37da49c4..722cdee107ef6fa8989cb5f149c58cabfc049d91 100644
+index 54f27d91f941235a99e341ed84531ad7f0840728..bb45f1f7691e7ce9ad819a8ceac0d3c3e962a5ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -264,7 +264,7 @@ import javax.annotation.Nullable; // Paper
+@@ -265,7 +265,7 @@ import javax.annotation.Nullable; // Paper
 import javax.annotation.Nonnull; // Paper
 
 public final class CraftServer implements Server {
--- a/patches/server/0008-Gale-configuration.patch
+++ b/patches/server/0008-Gale-configuration.patch
@@ -381,7 +381,7 @@ index 18aac3da3c88f33b1a71a5920a8daa27e9723913..513916690d2579760f59edecb1a273f4
         this.convertable = convertable_conversionsession;
         this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 147d802d9207e358fdb2d1c7806fc2f634dcfd98..71189e98dcb71e625defe5a0bd6355597c9382e6 100644
+index f39ab10c5b0b8d86b579a5b683491204c51db70b..f95aa6362605c10145a212ed4b7df42ad443f4cf 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -1,10 +1,7 @@
@@ -457,10 +457,10 @@ 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 722cdee107ef6fa8989cb5f149c58cabfc049d91..f87cf24b78e9c09b45fe9afc0deac91b65956dbb 100644
+index bb45f1f7691e7ce9ad819a8ceac0d3c3e962a5ce..c2e22dd084d922a827e6dd53e8634ec5b9e2d1ee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1056,6 +1056,7 @@ public final class CraftServer implements Server {
+@@ -1057,6 +1057,7 @@ public final class CraftServer implements Server {
 
         org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
         this.console.paperConfigurations.reloadConfigs(this.console);
@@ -468,7 +468,7 @@ index 722cdee107ef6fa8989cb5f149c58cabfc049d91..f87cf24b78e9c09b45fe9afc0deac91b
         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))
-@@ -2864,6 +2865,14 @@ public final class CraftServer implements Server {
+@@ -2902,6 +2903,14 @@ public final class CraftServer implements Server {
             return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
         }
 
--- a/patches/server/0017-Remove-vanilla-profiler.patch
+++ b/patches/server/0017-Remove-vanilla-profiler.patch
@@ -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 9d46536f80b5b3e6641fd377c02166a431edfd77..8badf1d6239eca7e48819860ada3a1ce21c3b4db 100644
+index dc5fda83a66afbfeb7897fc20b4742899d8aca08..5986507deeb9f9f05b6045df4ef28afba802274c 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,10 +885,10 @@ index 9d46536f80b5b3e6641fd377c02166a431edfd77..8badf1d6239eca7e48819860ada3a1ce
                 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 316740b2ba4c85828f544249c8cdd6fa1b525d3f..27b177c3291bf2e6d7b8223bc3ea275c71fa0a49 100644
+index 75bd92e1d40588d3bc40fa7837943eec9f2062a6..8b0441f672f1821e31860d3318c09c309b276135 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
+@@ -397,7 +397,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
             this.aboveGroundVehicleTickCount = 0;
         }
 
@@ -896,7 +896,7 @@ index 316740b2ba4c85828f544249c8cdd6fa1b525d3f..27b177c3291bf2e6d7b8223bc3ea275c
         // Paper Start - give clients a longer time to respond to pings as per pre 1.12.2 timings
         // This should effectively place the keepalive handling back to "as it was" before 1.12.2
         long currentTime = Util.getMillis();
-@@ -416,7 +415,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -418,7 +417,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
         }
         // Paper end
 
@@ -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 4c298406ce06d39f8279049270c88ec0830733b1..6d6dc0e5457df7ac2a7166ffd62add6655b79e5b 100644
+index f189629f03503fc06b790729bd407b663a48e0db..015b2d60c0be5f37fcef489628da1f29395483c3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -809,7 +809,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
--- a/patches/server/0028-Print-stack-trace-for-plugins-not-shutting-down-task.patch
+++ b/patches/server/0028-Print-stack-trace-for-plugins-not-shutting-down-task.patch
@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f87cf24b78e9c09b45fe9afc0deac91b65956dbb..b8fc40f55c85b1ec65ebc45aca163d755266f61e 100644
+index c2e22dd084d922a827e6dd53e8634ec5b9e2d1ee..97226a1135e9228ec010110b5d24fae00a49996a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1140,6 +1140,13 @@ public final class CraftServer implements Server {
+@@ -1141,6 +1141,13 @@ public final class CraftServer implements Server {
                 plugin.getPluginMeta().getDisplayName(),
                 "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
             ));
--- a/patches/server/0045-Make-book-writing-configurable.patch
+++ b/patches/server/0045-Make-book-writing-configurable.patch
@@ -22,7 +22,7 @@ you to easily disable books, should you want to preemptively remove this
 functionality before additional exploits are found.

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3d33236932c14d651d393656b06ae8152cc89eee..bb68e65813f2f471add275023f53430c05170813 100644
+index 8b0441f672f1821e31860d3318c09c309b276135..9645952c84412adf5b98c2c189e6a9dc8612c8c8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -184,6 +184,8 @@ import net.minecraft.world.phys.Vec3;
@@ -34,7 +34,7 @@ index 3d33236932c14d651d393656b06ae8152cc89eee..bb68e65813f2f471add275023f53430c
 import org.slf4j.Logger;
 
 // CraftBukkit start
-@@ -1217,6 +1219,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1219,6 +1221,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
 
     @Override
     public void handleEditBook(ServerboundEditBookPacket packet) {
--- a/patches/server/0048-Make-chat-order-verification-configurable.patch
+++ b/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 5f3875c503fddc1fbac58d6f53dd757143222236..931d4cc4b2c237e68a469d18247bd1bffbaed346 100644
+index 9645952c84412adf5b98c2c189e6a9dc8612c8c8..b08365b0a8cb9a5471db67d9c1a91f73f4ab2878 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2370,6 +2370,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2372,6 +2372,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
     }
 
     private boolean updateChatOrder(Instant timestamp) {
--- a/patches/server/0054-Do-not-process-chat-commands-before-player-has-joine.patch
+++ b/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 8badf1d6239eca7e48819860ada3a1ce21c3b4db..c3076b07077873a852c8a59219bd6aa74f2b9212 100644
+index 5986507deeb9f9f05b6045df4ef28afba802274c..9c99384dac31b94d62d129868ad6f0131dd7bd16 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 8badf1d6239eca7e48819860ada3a1ce21c3b4db..c3076b07077873a852c8a59219bd6aa7
     // 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 931d4cc4b2c237e68a469d18247bd1bffbaed346..b9126ce87146a6f3b019200d33097676ec4116bd 100644
+index b08365b0a8cb9a5471db67d9c1a91f73f4ab2878..353e81397ba286ac67984ca143e7a98586612a98 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2347,6 +2347,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2349,6 +2349,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 931d4cc4b2c237e68a469d18247bd1bffbaed346..b9126ce87146a6f3b019200d33097676
                 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 fff7ad7a45f310783ac96b44575ad3db13d537fa..46b462d9092f33675626aa5ae0d3f1cc654c650f 100644
+index 640e9bd618dc8286933318744c2064ede1fd9b5f..22697de39b8d00a522689d5abf894621cf051c89 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 {
--- a/patches/server/0056-Do-not-log-empty-message-warnings.patch
+++ b/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 b9126ce87146a6f3b019200d33097676ec4116bd..084c6e9d927ce76eb81792d98bc8c6fd27a2cf49 100644
+index 353e81397ba286ac67984ca143e7a98586612a98..6257e19bc6cfeae300babb99730361dfcd7459d2 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 b9126ce87146a6f3b019200d33097676ec4116bd..084c6e9d927ce76eb81792d98bc8c6fd
 import org.galemc.gale.configuration.GaleGlobalConfiguration;
 import org.slf4j.Logger;
 
-@@ -2559,7 +2560,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2555,7 +2556,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
         // CraftBukkit start
         String s = message.signedContent();
         if (s.isEmpty()) {
--- a/patches/server/0062-Do-not-log-out-of-order-message-warnings.patch
+++ b/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 084c6e9d927ce76eb81792d98bc8c6fd27a2cf49..fbcd1384f8a56efeb5f4e6883b41616a784e516a 100644
+index 6257e19bc6cfeae300babb99730361dfcd7459d2..a72876beab9a0522ef3239b718e5be295a90da94 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2337,7 +2337,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2339,7 +2339,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
 
     private Optional<LastSeenMessages> tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) {
         if (!this.updateChatOrder(timestamp)) {
--- a/patches/server/0079-Reduce-array-allocations.patch
+++ b/patches/server/0079-Reduce-array-allocations.patch
@@ -425,7 +425,7 @@ index ae74867e5ca1a77c99d6d2e39e916a6c3cf4f866..151b354d6b9613a2715bf618ff6bff43
 import net.minecraft.ReportedException;
 import net.minecraft.SharedConstants;
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index c122671d89a06474f0618f52a3e4abd5214e2839..59ce2175afd1210344ce2c9f557193ff9139bcee 100644
+index e215cb22a226fa61d7eb9a8f69fe2a644d4394f7..d23fe810b1b971abe4ed52018929a40817060fdc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
@@ -332,7 +332,7 @@ public class ServerEntity {
@@ -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 a48770650bd2fd52c6a90acd9e69e4fdd9548e30..58fa40518af4c79f01d6b54672dab631c4a7d97b 100644
+index a72876beab9a0522ef3239b718e5be295a90da94..c51aee272b5cc991fec5fd0242f493ab6e9e4b32 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;
@@ -497,7 +497,7 @@ index a48770650bd2fd52c6a90acd9e69e4fdd9548e30..58fa40518af4c79f01d6b54672dab631
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.BlockHitResult;
-@@ -228,8 +228,6 @@ import org.bukkit.event.inventory.InventoryCreativeEvent;
+@@ -230,8 +230,6 @@ import org.bukkit.event.inventory.InventoryCreativeEvent;
 import org.bukkit.event.inventory.InventoryType.SlotType;
 import org.bukkit.event.inventory.SmithItemEvent;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
@@ -506,7 +506,7 @@ index a48770650bd2fd52c6a90acd9e69e4fdd9548e30..58fa40518af4c79f01d6b54672dab631
 import org.bukkit.event.player.PlayerChatEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerInteractAtEntityEvent;
-@@ -406,7 +404,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -408,7 +406,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
         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
@@ -515,7 +515,7 @@ index a48770650bd2fd52c6a90acd9e69e4fdd9548e30..58fa40518af4c79f01d6b54672dab631
             }
         } else {
             if (elapsedTime >= 15000L) { // 15 seconds
-@@ -884,13 +882,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -886,13 +884,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
         // PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // Paper - run this async
         // CraftBukkit start
         if (this.chatSpamTickCount.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamLimit && !this.server.getPlayerList().isOp(this.player.getGameProfile())) { // Paper start - split and make configurable
@@ -531,7 +531,7 @@ index a48770650bd2fd52c6a90acd9e69e4fdd9548e30..58fa40518af4c79f01d6b54672dab631
             return;
         }
         // Paper end
-@@ -3311,7 +3309,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3310,7 +3308,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 0d034a1b810e3840055a10ca1960eecbbf306549..00166d86baad60beed5896871c9b9118
         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 f300964912f76cc97074e954dfcddad3e62d4af0..8fe9fd6828f9fdfcd587d67471a4199602807e74 100644
+index 4c5d2c3e50be81435260207dc1208c083a8201e6..87fabd874b39a6a21ca7fb2c6207a4cec048328c 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;
@@ -746,10 +746,10 @@ 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 86304357ca687036cf2448f8cd7c639bdc309e25..d0e2304cd9096c7f1ca4843bb365303f555c1f19 100644
+index 879cc823d56625867eb73bb621db6a13f40ad81c..3d589c9698129ab2a09093425d0bb97c5a3897f9 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -1015,7 +1015,7 @@ public final class ItemStack {
+@@ -1019,7 +1019,7 @@ public final class ItemStack {
         int k;
 
         if (ItemStack.shouldShowInTooltip(i, ItemStack.TooltipPart.MODIFIERS)) {
--- a/patches/server/0112-Send-multiple-keep-alive-packets.patch
+++ b/patches/server/0112-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 58fa40518af4c79f01d6b54672dab631c4a7d97b..b2ee2dbfb5533f738224af0eb3868d6a04a55532 100644
+index c51aee272b5cc991fec5fd0242f493ab6e9e4b32..4633aaf37dad0348191880f3d4cd91c4e7cc4737 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;
@@ -49,7 +49,7 @@ index 58fa40518af4c79f01d6b54672dab631c4a7d97b..b2ee2dbfb5533f738224af0eb3868d6a
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectIterator;
 import java.net.SocketAddress;
-@@ -264,6 +266,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -266,6 +268,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
     private long keepAliveTime = Util.getMillis();
     private boolean keepAlivePending;
     private long keepAliveChallenge;
@@ -57,7 +57,7 @@ index 58fa40518af4c79f01d6b54672dab631c4a7d97b..b2ee2dbfb5533f738224af0eb3868d6a
     // CraftBukkit start - multithreaded fields
     private final AtomicInteger chatSpamTickCount = new AtomicInteger();
     private final java.util.concurrent.atomic.AtomicInteger tabSpamLimiter = new java.util.concurrent.atomic.AtomicInteger(); // Paper - configurable tab spam limits
-@@ -302,7 +305,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -304,7 +307,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
     private final LastSeenMessagesValidator lastSeenMessages;
     private final MessageSignatureCache messageSignatureCache;
     private final FutureChain chatMessageChain;
@@ -69,7 +69,7 @@ index 58fa40518af4c79f01d6b54672dab631c4a7d97b..b2ee2dbfb5533f738224af0eb3868d6a
     private static final int MAX_SIGN_LINE_LENGTH = Integer.getInteger("Paper.maxSignLength", 80); // Paper
 
     private String clientBrandName = null; // Paper - Brand name
-@@ -401,6 +407,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -403,6 +409,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
         long currentTime = Util.getMillis();
         long elapsedTime = currentTime - this.keepAliveTime;
 
@@ -91,7 +91,7 @@ index 58fa40518af4c79f01d6b54672dab631c4a7d97b..b2ee2dbfb5533f738224af0eb3868d6a
         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
-@@ -3476,6 +3497,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3502,6 +3523,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
 
     @Override
     public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
--- a/patches/server/0114-Make-max-interaction-distance-configurable.patch
+++ b/patches/server/0114-Make-max-interaction-distance-configurable.patch
@@ -20,10 +20,10 @@ index baf3e79489e310f443788bc917c553ae7ea86c89..f830ff98ac6e94fa4f0c9d85bcdd8f38
             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 b2ee2dbfb5533f738224af0eb3868d6a04a55532..b3205b20643cf380fa75f0c35bcb77f4496f7055 100644
+index 4633aaf37dad0348191880f3d4cd91c4e7cc4737..cafe296c9613c3363971a04a9fcd96bf1be8781b 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
+@@ -256,7 +256,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
 
     static final Logger LOGGER = LogUtils.getLogger();
     private static final int LATENCY_CHECK_INTERVAL = 15000;
@@ -32,7 +32,7 @@ index b2ee2dbfb5533f738224af0eb3868d6a04a55532..b3205b20643cf380fa75f0c35bcb77f4
     private static final int NO_BLOCK_UPDATES_TO_ACK = -1;
     private static final int TRACKED_MESSAGE_DISCONNECT_THRESHOLD = 4096;
     private static final Component CHAT_VALIDATION_FAILED = Component.translatable("multiplayer.disconnect.chat_validation_failed");
-@@ -352,6 +352,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -354,6 +354,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
     }
     // CraftBukkit end
 
@@ -46,7 +46,7 @@ index b2ee2dbfb5533f738224af0eb3868d6a04a55532..b3205b20643cf380fa75f0c35bcb77f4
     @Override
     public void tick() {
         if (this.ackBlockChangesUpTo > -1) {
-@@ -1969,7 +1976,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1971,7 +1978,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
             BlockPos blockposition = movingobjectpositionblock.getBlockPos();
             Vec3 vec3d1 = Vec3.atCenterOf(blockposition);
 
@@ -55,7 +55,7 @@ index b2ee2dbfb5533f738224af0eb3868d6a04a55532..b3205b20643cf380fa75f0c35bcb77f4
                 Vec3 vec3d2 = vec3d.subtract(vec3d1);
                 double d0 = 1.0000001D;
 
-@@ -2836,7 +2843,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2835,7 +2842,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
 
             AABB axisalignedbb = entity.getBoundingBox();
 
--- a/patches/server/0123-CraftBukkit-UUID-to-world-map.patch
+++ b/patches/server/0123-CraftBukkit-UUID-to-world-map.patch
@@ -13,10 +13,10 @@ 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 b8fc40f55c85b1ec65ebc45aca163d755266f61e..5b0ccf20bfa38621248ba730fc5a9dd742358643 100644
+index 97226a1135e9228ec010110b5d24fae00a49996a..9855ce266ef6d8fb75376160f353fa21db784a97 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -43,6 +43,9 @@ import java.util.logging.Level;
+@@ -44,6 +44,9 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import javax.imageio.ImageIO;
@@ -26,7 +26,7 @@ index b8fc40f55c85b1ec65ebc45aca163d755266f61e..5b0ccf20bfa38621248ba730fc5a9dd7
 import net.minecraft.advancements.Advancement;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
-@@ -279,6 +282,7 @@ public final class CraftServer implements Server {
+@@ -280,6 +283,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 b8fc40f55c85b1ec65ebc45aca163d755266f61e..5b0ccf20bfa38621248ba730fc5a9dd7
     private final Map<Class<?>, Registry<?>> registries = new HashMap<>();
     private YamlConfiguration configuration;
     private YamlConfiguration commandsConfiguration;
-@@ -1417,6 +1421,7 @@ public final class CraftServer implements Server {
+@@ -1430,6 +1434,7 @@ public final class CraftServer implements Server {
             this.getLogger().log(Level.SEVERE, null, ex);
         }
 
@@ -42,7 +42,7 @@ index b8fc40f55c85b1ec65ebc45aca163d755266f61e..5b0ccf20bfa38621248ba730fc5a9dd7
         this.worlds.remove(world.getName().toLowerCase(java.util.Locale.ENGLISH));
         this.console.removeLevel(handle);
         return true;
-@@ -1435,12 +1440,7 @@ public final class CraftServer implements Server {
+@@ -1448,12 +1453,7 @@ public final class CraftServer implements Server {
 
     @Override
     public World getWorld(UUID uid) {
@@ -56,7 +56,7 @@ index b8fc40f55c85b1ec65ebc45aca163d755266f61e..5b0ccf20bfa38621248ba730fc5a9dd7
     }
 
     // Paper start
-@@ -1458,6 +1458,7 @@ public final class CraftServer implements Server {
+@@ -1471,6 +1471,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;
         }
--- a/patches/server/0125-Specific-interval-TPS-API.patch
+++ b/patches/server/0125-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 5b0ccf20bfa38621248ba730fc5a9dd742358643..a2d3243607e5b2535f08796ae52f022bf0c03bcf 100644
+index 9855ce266ef6d8fb75376160f353fa21db784a97..3f7af9fde58937cc8b6bb7d7c114304c4b002168 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2833,6 +2833,25 @@ public final class CraftServer implements Server {
+@@ -2871,6 +2871,25 @@ public final class CraftServer implements Server {
         };
     }
 
--- a/patches/server/0126-5-second-TPS-average.patch
+++ b/patches/server/0126-5-second-TPS-average.patch
@@ -79,10 +79,10 @@ index 151b354d6b9613a2715bf618ff6bff4331006093..1b081bf1407d98a4cc664adc4633533a
                     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 a2d3243607e5b2535f08796ae52f022bf0c03bcf..90b6b925477f6b9309705ddf290d7ac28205cded 100644
+index 3f7af9fde58937cc8b6bb7d7c114304c4b002168..8d0f0a7723e1c06bea8516e9fd8f2e71a5744acb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2833,8 +2833,27 @@ public final class CraftServer implements Server {
+@@ -2871,8 +2871,27 @@ public final class CraftServer implements Server {
         };
     }
 
--- a/patches/server/0128-Last-tick-time-API.patch
+++ b/patches/server/0128-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 90b6b925477f6b9309705ddf290d7ac28205cded..205edac36bab2fabd3503d71f0a70d0927acaaca 100644
+index 8d0f0a7723e1c06bea8516e9fd8f2e71a5744acb..58642c412f5ca3bcd462017ff83f8ba8397d57a0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3132,4 +3132,22 @@ public final class CraftServer implements Server {
+@@ -3170,4 +3170,22 @@ public final class CraftServer implements Server {
     }
 
     // Paper end
--- a/patches/server/0133-Optimize-matching-item-checks.patch
+++ b/patches/server/0133-Optimize-matching-item-checks.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/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index d0e2304cd9096c7f1ca4843bb365303f555c1f19..b681ed94170d1d8bc7904b050cb20a609d266a3b 100644
+index 3d589c9698129ab2a09093425d0bb97c5a3897f9..0116eeff6de9948c398486c4f910d58862f88eb9 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -750,15 +750,15 @@ public final class ItemStack {
+@@ -754,15 +754,15 @@ public final class ItemStack {
     }
 
     public static boolean matches(ItemStack left, ItemStack right) {
--- a/patches/server/0134-Reduce-RandomSource-instances.patch
+++ b/patches/server/0134-Reduce-RandomSource-instances.patch
@@ -26,7 +26,7 @@ index f5bc3497831877e0c2b7dc1cbd8abe3a67d7695b..5783a8014e3faf93b81903c947b2534e
             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 0e765c1fb7b93905b7aff8f03fcabba7dc2d8cfa..00ce8b78e35055da01a053cb0d4ed914d50acebc 100644
+index 8e216eaafb1b90d4fd373a4384ecff0b1e917835..43c170fe1eed27e1b0367a3b277cc6d034bc34e1 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 {
@@ -122,24 +122,24 @@ index 414a47a82927bed02a4f3cf330c78e46f1d66782..cc17cb985856fd8d1083b5b1f57f82c6
 
     @Override
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index e2cd77d9de9709aa50f4b6febabe21bfcf94dc5d..f04699f87e1a52b7349fe776de44af0c5fa01343 100644
+index 02d5a5b799bfe90993bc6868369d31f43d5b7fd6..07f0b0807358e595b76e70e5b8716caaab383a0c 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-@@ -402,7 +402,7 @@ public class EndDragonFight {
-         this.level.registryAccess().registry(Registries.CONFIGURED_FEATURE).flatMap((registry) -> {
-             return registry.getHolder(EndFeatures.END_GATEWAY_DELAYED);
-         }).ifPresent((reference) -> {
-            reference.value().place(this.level, this.level.getChunkSource().getGenerator(), RandomSource.create(), pos);
-+            reference.value().place(this.level, this.level.getChunkSource().getGenerator(), this.level.random, pos); // Gale - Patina - reduce RandomSource instances
+@@ -454,7 +454,7 @@ public class EndDragonFight {
+         this.level.registryAccess().registry(Registries.CONFIGURED_FEATURE).flatMap((iregistry) -> {
+             return iregistry.getHolder(EndFeatures.END_GATEWAY_DELAYED);
+         }).ifPresent((holder_c) -> {
+-            ((ConfiguredFeature) holder_c.value()).place(this.level, this.level.getChunkSource().getGenerator(), RandomSource.create(), pos);
+            ((ConfiguredFeature) holder_c.value()).place(this.level, this.level.getChunkSource().getGenerator(), this.level.random, pos); // Gale - Patina - reduce RandomSource instances
         });
     }
 
-@@ -418,7 +418,7 @@ public class EndDragonFight {
+@@ -472,7 +472,7 @@ public class EndDragonFight {
             this.portalLocation = this.portalLocation.atY(this.level.getMinBuildHeight() + 1);
         }
         // Paper end
-        endPodiumFeature.place(FeatureConfiguration.NONE, this.level, this.level.getChunkSource().getGenerator(), RandomSource.create(), this.portalLocation);
-+        endPodiumFeature.place(FeatureConfiguration.NONE, this.level, this.level.getChunkSource().getGenerator(), this.level.random, this.portalLocation); // Gale - Patina - reduce RandomSource instances
+-        worldgenendtrophy.place(FeatureConfiguration.NONE, this.level, this.level.getChunkSource().getGenerator(), RandomSource.create(), this.portalLocation);
+        worldgenendtrophy.place(FeatureConfiguration.NONE, this.level, this.level.getChunkSource().getGenerator(), this.level.random, this.portalLocation); // Gale - Patina - reduce RandomSource instances
     }
 
     @Nullable