Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@d1a72ea Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11405) PaperMC/Paper@0a53f1d Set default drop behavior for player deaths (#11380) PaperMC/Paper@951e7dd Fix TrialSpawner forgetting assigned mob when placed by player (#11381) PaperMC/Paper@13a2395 Fix enable-player-collisions playing sounds when set to false (#11390)
Dreeam-qwq · Sep 16, 2024 · f346681 · f346681
1 parent a8d8e69
commit f346681
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 42 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ group=org.galemc.gale
 version=1.21.1-R0.1-SNAPSHOT
 
 mcVersion=1.21.1
-paperRef=4ff58c4c48383b17446b7bbad3e477dbe74aee9f
+paperRef=13a23951d7142c3c4c39bd5e9bddac190b90c151
 
 org.gradle.caching=false
 org.gradle.parallel=true

diff --git a/patches/server/0008-Gale-configuration.patch b/patches/server/0008-Gale-configuration.patch
@@ -289,7 +289,7 @@ index dd56c8e041116ef3602a9f89c998c8208ab89b51..86c615518e315dd4425d17df163e88a1
          // Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save
          if (this.convertOldUsers()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2fe9d9b38c01d04416843fdd48d3e33899b7de63..108a3edd8dff37c19feac1f247c57a9deae15887 100644
+index c96f3dcd365bc140b1f4680ef6bd770c80f8eda1..a74d64c33182cc1f2ea78b6ddb6b358ec2c8a91c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -503,7 +503,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -356,7 +356,7 @@ index e2a0487089eb5a7bdc1433e4c75f69d8e9f9d5f9..90fc52bb3c8c48e055965f2f822c6199
          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 1b36e94617d4e777c419660936460d5cf8a4b3e8..bf5bed5f27455d0560ad6fb845516753e78ef701 100644
+index b7af2d4300facf41a025c8ca322bf6541949b3ab..49c1a96f35ac80b6de3f213d809d856bc21af5af 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1070,6 +1070,7 @@ public final class CraftServer implements Server {
@@ -367,7 +367,7 @@ index 1b36e94617d4e777c419660936460d5cf8a4b3e8..bf5bed5f27455d0560ad6fb845516753
          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))
-@@ -2991,6 +2992,14 @@ public final class CraftServer implements Server {
+@@ -2988,6 +2989,14 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
 

diff --git a/patches/server/0011-Remove-vanilla-profiler.patch b/patches/server/0011-Remove-vanilla-profiler.patch
@@ -1028,18 +1028,18 @@ index c396580a9cfd86ff261bed439bb4662ae88010b5..adba25adaaf32c07e6844faec12bcab8
                  this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
                  playerlist.sendLevelInfo(this, worldserver);
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index b43f87ff4b9853b5d4bbea5ff9686d64d9d0d26b..8757a6ac609d463f94846d66fe04f50e859e7ce8 100644
+index 6998f32f8d79dbdb6b31ffaa126602fc4a428616..148e66f9d749f2cd0da00b5fa95233f593329d99 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-@@ -247,7 +247,6 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -252,7 +252,6 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
      }
 
      protected void keepConnectionAlive() {
 -        this.server.getProfiler().push("keepAlive");
          // 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();
-@@ -265,7 +264,6 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -270,7 +269,6 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
          }
          // Paper end - give clients a longer time to respond to pings as per pre 1.12.2 timings
 
@@ -1162,7 +1162,7 @@ index 2188274de5d1fe1aa5419be6247da6a3a2414a3b..3c60eb7a77eb302d0402dfa599a88cae
          Executor applyExecutor
      ) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e0827d8bb3fa17d4f590a5342ff41a514f623e68..e328fea269e034f15ec0893491fdb81b22dcddb7 100644
+index 9f68c0fda7f5526eb97619f1a35ed3b78d1b3751..3a5f832578abbf3ead4d5bd99eee1438a2e74b35 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -858,7 +858,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1260,7 +1260,7 @@ index e0827d8bb3fa17d4f590a5342ff41a514f623e68..e328fea269e034f15ec0893491fdb81b
              }
          }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9c9e2377f44b1f1bbd8bb0e8bc963a80f4f9ee68..3eb76e4b5466a2a068b4cde235a7d078e8527db5 100644
+index 30f4f1254fc295442d72d50479e8af635f2fe983..f4345d34196f319c93eb12a86b74881d3b12b005 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -440,7 +440,6 @@ public abstract class LivingEntity extends Entity implements Attackable {

diff --git a/patches/server/0053-Do-not-log-Not-Secure-marker.patch b/patches/server/0053-Do-not-log-Not-Secure-marker.patch
@@ -29,7 +29,7 @@ index 14e412ebf75b0e06ab53a1c8f9dd1be6ad1e2680..f962e82e2c70f328a23dc99193d072f8
      }
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 35141b78f8eeac0956bffbb38d042501e5ddde7a..2f61aa245d76e760d51eda2aa99cd00d2e147243 100644
+index c7c03291e9b49fbaaae8774ab3dcdc442c588e3a..32999fcbee6252c208e67bcc17cfb8ebbaad4e5b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -102,6 +102,7 @@ import net.minecraft.world.phys.Vec3;
@@ -40,7 +40,7 @@ index 35141b78f8eeac0956bffbb38d042501e5ddde7a..2f61aa245d76e760d51eda2aa99cd00d
  import org.slf4j.Logger;
 
  // CraftBukkit start
-@@ -1391,7 +1392,7 @@ public abstract class PlayerList {
+@@ -1396,7 +1397,7 @@ public abstract class PlayerList {
          // Paper end
          boolean flag = this.verifyChatTrusted(message);
 

diff --git a/patches/server/0054-Do-not-log-disconnections-with-null-id.patch b/patches/server/0054-Do-not-log-disconnections-with-null-id.patch
@@ -17,7 +17,7 @@ Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 This can help to hide annoying scanning bots from showing up in console.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index b0f7a378f19b9837c060c891002cd5db756cdae1..22865e638a50397d194fb39b883f73753de1f7f0 100644
+index 40638b439966619e9c70a18a32abd95b2178fe9f..2754e5dda2bc50bff302cb569803bc8f1f04a9db 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -44,6 +44,7 @@ import net.minecraft.util.CryptException;
@@ -28,7 +28,7 @@ index b0f7a378f19b9837c060c891002cd5db756cdae1..22865e638a50397d194fb39b883f7375
  import org.slf4j.Logger;
  import net.minecraft.network.protocol.Packet;
  import net.minecraft.network.protocol.PacketUtils;
-@@ -141,6 +142,14 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -146,6 +147,14 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
 
      public void disconnect(Component reason) {
          try {

diff --git a/patches/server/0067-Reduce-array-allocations.patch b/patches/server/0067-Reduce-array-allocations.patch
@@ -377,10 +377,10 @@ index 93095ecefe3ce2209664e442b50a596cd0e7b0d4..6e010409af3856eb742e786669811f1f
 
                                  ServerGamePacketListenerImpl.this.player.containerMenu.sendAllDataToRemote(); // Paper - fix slot desync - always refresh player inventory
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 22865e638a50397d194fb39b883f73753de1f7f0..a60651bb5e1156db2b3ccd74e18661aa3f19b9c2 100644
+index 2754e5dda2bc50bff302cb569803bc8f1f04a9db..1d4f1cdfd2b221b0ed0cef3bc266c829fd3555ef 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -176,14 +176,16 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -181,14 +181,16 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
 
      @Override
      public void handleHello(ServerboundHelloPacket packet) {
@@ -399,7 +399,7 @@ index 22865e638a50397d194fb39b883f73753de1f7f0..a60651bb5e1156db2b3ccd74e18661aa
          this.requestedUsername = packet.name();
          GameProfile gameprofile = this.server.getSingleplayerProfile();
 
-@@ -279,7 +281,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -284,7 +286,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
 
      @Override
      public void handleKey(ServerboundKeyPacket packet) {
@@ -408,7 +408,7 @@ index 22865e638a50397d194fb39b883f73753de1f7f0..a60651bb5e1156db2b3ccd74e18661aa
 
          final String s;
 
-@@ -460,7 +462,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -465,7 +467,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
      @Override
      public void handleLoginAcknowledgement(ServerboundLoginAcknowledgedPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.server); // CraftBukkit
@@ -502,7 +502,7 @@ index d75673cc8a5aeb7051b1d4fe729faf408e266dc4..0b8e5c2da9f57dbf8703baa1de3e1cf8
 
      private static Map<EquipmentSlot, Float> createForAllSlots(List<EquipmentSlot> slots, float dropChance) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 79ed54c658059e62b16704e5d5fe1527be2717e3..5bf7c9050df8beddd71ecb2fc14414f5e4016d79 100644
+index e5df16e415d6c8dc8547a59af373ae2918ec42dc..6c6e279cd351720bd8d867e2c6207e98a35d2c9d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3275,7 +3275,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -564,10 +564,10 @@ index 427e2711b942a61b491b2fe9fc1d02e67d446ad0..9dbcebe04ad9dd2f5558e92e85749c70
 
                      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 b6a2f3e4f22f36e75a1630bd456c2f471edbb398..51b1244b7a1f1beeac66a2763dced74798aa6d1b 100644
+index eec0ec43590be7e8ae5b530a7404c98b5e23cb53..21d8666ed24dae109792c094b9ce7eeb9100b4d9 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -1124,7 +1124,7 @@ public final class ItemStack implements DataComponentHolder {
+@@ -1122,7 +1122,7 @@ public final class ItemStack implements DataComponentHolder {
          ItemAttributeModifiers itemattributemodifiers = (ItemAttributeModifiers) this.getOrDefault(DataComponents.ATTRIBUTE_MODIFIERS, ItemAttributeModifiers.EMPTY);
 
          if (itemattributemodifiers.showInTooltip()) {

diff --git a/patches/server/0093-Spread-out-sending-all-player-info.patch b/patches/server/0093-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 0f6fba34ca7bb83f40e4e47ba0fcdea754668033..78868d7b5fd0d25845937c6e63f81cb972569c04 100644
+index 9b265924086edfdd29d155a94ad968d62c2fa924..bd555d1f9ce00b53f8d3b2b82012cf3716e205a6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -13,6 +13,8 @@ import java.net.SocketAddress;
@@ -94,7 +94,7 @@ index 0f6fba34ca7bb83f40e4e47ba0fcdea754668033..78868d7b5fd0d25845937c6e63f81cb9
              this.playersByName.put(entityplayer1.getScoreboardName().toLowerCase(java.util.Locale.ROOT), entityplayer1); // Spigot
              this.playersByUUID.put(entityplayer1.getUUID(), entityplayer1);
          }
-@@ -981,20 +988,55 @@ public abstract class PlayerList {
+@@ -986,20 +993,55 @@ public abstract class PlayerList {
          this.sendPlayerPermissionLevel(player, i, recalculatePermissions); // Paper - avoid recalculating permissions if possible
      }
 

diff --git a/patches/server/0094-Optimize-player-list-for-sending-player-info.patch b/patches/server/0094-Optimize-player-list-for-sending-player-info.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/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 78868d7b5fd0d25845937c6e63f81cb972569c04..d0ce419b120d001c611297a97d754cc9ffc9b2ea 100644
+index bd555d1f9ce00b53f8d3b2b82012cf3716e205a6..da20474463e776cdd922a905482cd7412486a2f0 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1024,14 +1024,18 @@ public abstract class PlayerList {
+@@ -1029,14 +1029,18 @@ public abstract class PlayerList {
          // Gale start - Purpur - spread out sending all player info
          ServerPlayer[] sendAllPlayerInfoBucket = this.sendAllPlayerInfoBuckets[this.sendAllPlayerInfoIn];
          if (sendAllPlayerInfoBucket != null) {

diff --git a/patches/server/0096-Send-multiple-keep-alive-packets.patch b/patches/server/0096-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/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 8757a6ac609d463f94846d66fe04f50e859e7ce8..a720a05c47b2137a07515461960603cc5c939d16 100644
+index 148e66f9d749f2cd0da00b5fa95233f593329d99..8847873e5fc1fdf272d3acb84289a54efaa62b64 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -4,6 +4,9 @@ import com.mojang.authlib.GameProfile;
@@ -58,7 +58,7 @@ index 8757a6ac609d463f94846d66fe04f50e859e7ce8..a720a05c47b2137a07515461960603cc
  import org.slf4j.Logger;
 
  // CraftBukkit start
-@@ -74,10 +78,14 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -79,10 +83,14 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
      private long keepAliveChallenge;
      private long closedListenerTime;
      private boolean closed = false;
@@ -74,7 +74,7 @@ index 8757a6ac609d463f94846d66fe04f50e859e7ce8..a720a05c47b2137a07515461960603cc
      protected static final ResourceLocation MINECRAFT_BRAND = ResourceLocation.withDefaultNamespace("brand"); // Paper - Brand support
 
      public ServerCommonPacketListenerImpl(MinecraftServer minecraftserver, Connection networkmanager, CommonListenerCookie commonlistenercookie, ServerPlayer player) { // CraftBukkit
-@@ -125,6 +133,16 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -130,6 +138,16 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
      @Override
      public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
          //PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // CraftBukkit // Paper - handle ServerboundKeepAlivePacket async
@@ -91,15 +91,15 @@ index 8757a6ac609d463f94846d66fe04f50e859e7ce8..a720a05c47b2137a07515461960603cc
          if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
              int i = (int) (Util.getMillis() - this.keepAliveTime);
 
-@@ -137,6 +155,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -142,6 +160,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
              });
              // Paper end - This needs to be handled on the main thread for plugins
          }
 +        } // Gale - Purpur - send multiple keep-alive packets
 
      }
 
-@@ -252,6 +271,21 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -257,6 +276,21 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
          long currentTime = Util.getMillis();
          long elapsedTime = currentTime - this.keepAliveTime;
 
@@ -121,7 +121,7 @@ index 8757a6ac609d463f94846d66fe04f50e859e7ce8..a720a05c47b2137a07515461960603cc
          if (!this.isSingleplayerOwner() && elapsedTime >= 15000L) { // Paper - use vanilla's 15000L between keep alive packets
              if (this.keepAlivePending && !this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // Paper - check keepalive limit, don't fire if already disconnected
                  this.disconnect(ServerCommonPacketListenerImpl.TIMEOUT_DISCONNECTION_MESSAGE, PlayerKickEvent.Cause.TIMEOUT); // Paper - kick event cause
-@@ -262,6 +296,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -267,6 +301,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
                  this.send(new ClientboundKeepAlivePacket(this.keepAliveChallenge));
              }
          }
@@ -130,7 +130,7 @@ index 8757a6ac609d463f94846d66fe04f50e859e7ce8..a720a05c47b2137a07515461960603cc
 
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f4b7ac0d9571daf751196e342016601dbd2f2787..ec3f2907cd850c163d2e703fcbb8c025c0eaeedb 100644
+index 6e010409af3856eb742e786669811f1f7ea217d8..1816eea82d60e4433541a90c83825529301c6818 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -9,6 +9,8 @@ import com.mojang.brigadier.suggestion.Suggestions;

diff --git a/patches/server/0097-Make-slow-login-timeout-configurable.patch b/patches/server/0097-Make-slow-login-timeout-configurable.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/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index a60651bb5e1156db2b3ccd74e18661aa3f19b9c2..1d11d0388b9763a0e0e5f3398425dafa2bb01488 100644
+index 1d4f1cdfd2b221b0ed0cef3bc266c829fd3555ef..4e4f14ba35a1a5944c605dfd1784047d43e559ce 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -122,7 +122,10 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -127,7 +127,10 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
              this.finishLoginAndWaitForClient(this.authenticatedProfile);
          }
 

diff --git a/patches/server/0108-Specific-interval-TPS-API.patch b/patches/server/0108-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 0ef77faaa91e6041e6c7ef6168901e9756a4900b..08a5c4df85714619e19bff8ae26fe0ea5b58255b 100644
+index 21bf160591b9fc26339ff639824e68014ac3ccd3..34d1e6c69edfed04cef41a909e844f21efa0d07b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3043,6 +3043,24 @@ public final class CraftServer implements Server {
+@@ -3040,6 +3040,24 @@ public final class CraftServer implements Server {
          };
      }