Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@41bc31b Update paperweight to 1.7.3 (#11445)
PaperMC/Paper@e17eb6b Improve entity effect API (#11444)
PaperMC/Paper@7b03141 Add startingBrewTime (#11406)
PaperMC/Paper@355b1cb Add API for explosions to damage the explosion cause (#11180)
PaperMC/Paper@6d7a438 Call bucket events for cauldrons (#7486)

build.gradle.kts

@@ -4,7 +4,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 plugins {
     java
     `maven-publish`
-    id("io.papermc.paperweight.patcher") version "1.7.1"
+    id("io.papermc.paperweight.patcher") version "1.7.3"
 }
 
 allprojects {

gradle.properties

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21.1-R0.1-SNAPSHOT
 
 mcVersion = 1.21.1
-paperCommit = b7ab22dee18865a9a3983103767a9caf46db4a3a
+paperCommit = 6d7a438faddfbea99d6af7f99f99a480883cef8a
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0006-Purpur-client-support.patch

@@ -5,13 +5,13 @@ Subject: [PATCH] Purpur client support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 7c56182acaf827f4b1a986a61cea8e9960604c98..72680755962efb542cbb3c0aa079af061496b6ff 100644
+index 8086acceacbceb2c5a7228fff005e41a86d37008..be19348117cf79dea23f1fb3055a726818e7db55 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3859,4 +3859,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-     @Override
-     Spigot spigot();
-     // Spigot end
+@@ -3871,4 +3871,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      */
+     void sendEntityEffect(org.bukkit.@NotNull EntityEffect effect, @NotNull Entity target);
+     // Paper end - entity effect API
 +
 +    // Purpur start
 +    /**

patches/api/0008-Ridables.patch

@@ -5,13 +5,13 @@ Subject: [PATCH] Ridables
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 725ef320f929d5e3d141c1ed3246d73a7d741f31..514611cf71cafc8e7e07ef901c2ccad03cd5f31b 100644
+index d0ae8a94db20281d3664d74718c65234eb2e5f83..bf6d13cc6b0566f4076383c8f170dc8c9589e416 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1159,4 +1159,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1172,4 +1172,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
-     @NotNull String getScoreboardEntryName();
-     // Paper end - entity scoreboard name
+     void broadcastHurtAnimation(@NotNull java.util.Collection<Player> players);
+     // Paper end - broadcast hurt animation
 +
 +    // Purpur start
 +    /**

patches/api/0011-AFK-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 72680755962efb542cbb3c0aa079af061496b6ff..36d73f14d70c4b1768f3b7dfa235a6a2411e4687 100644
+index be19348117cf79dea23f1fb3055a726818e7db55..e93ce0e0a6cfd7c0596d50a6255151f5ef84b2ce 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3867,5 +3867,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3879,5 +3879,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @return True if Player uses Purpur Client
       */
      public boolean usesPurpurClient();

patches/api/0026-API-for-any-mob-to-burn-daylight.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
 Co-authored by: Encode42 <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 514611cf71cafc8e7e07ef901c2ccad03cd5f31b..8c9c4183785a47b64f084f4b8cdac53d2d4402aa 100644
+index bf6d13cc6b0566f4076383c8f170dc8c9589e416..22713e97e7c7b643b80c07a88ae890d7c4304730 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1189,5 +1189,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1202,5 +1202,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       * @return True if ridable in water
       */
      boolean isRidableInWater();

patches/api/0036-Add-local-difficulty-api.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add local difficulty api
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index d8a23aa0d898ca3360757721e38ddb97387f7d21..5b715f260eb9bdceae9310e1f773890607c62929 100644
+index adcd8161846b06fd1a7895750f98b629204a8406..c9edc1d91046c80feb39a2f9cb7f3b69a99fe0b5 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4145,6 +4145,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4161,6 +4161,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      public DragonBattle getEnderDragonBattle();
 

patches/api/0039-Debug-Marker-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Debug Marker API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 1ce82760b0b254abf9e2994883694794502ad93b..4cd159133d6dc3a6ec1b822e8625920f3919931e 100644
+index b08482b4e9f5d62882512eada787e876c4c21746..3a71f8fe73a2309f57cb06dedf204d3e37b46b03 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2959,5 +2959,89 @@ public final class Bukkit {
@@ -99,7 +99,7 @@ index 1ce82760b0b254abf9e2994883694794502ad93b..4cd159133d6dc3a6ec1b822e8625920f
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 779dc2556f4d3b2cd46d8926636f7a5b0cf1a744..84b07a7fd7941b2f75b531646b67a124a0607390 100644
+index 5c0dbd534aaab560a4f327f48e1359de0bf7d3c9..eb29794f6ca2efc9cde4dd1685822f9a3a73f3b9 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2596,5 +2596,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -179,10 +179,10 @@ index 779dc2556f4d3b2cd46d8926636f7a5b0cf1a744..84b07a7fd7941b2f75b531646b67a124
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 5b715f260eb9bdceae9310e1f773890607c62929..ca600d3e8b1f4fae299b1bf3d283c466c18875a6 100644
+index c9edc1d91046c80feb39a2f9cb7f3b69a99fe0b5..efe32ca9cbe0cd43e308ab0528f345345584c254 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4153,6 +4153,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4169,6 +4169,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       * @return The local difficulty
       */
      public float getLocalDifficultyAt(@NotNull Location location);
@@ -260,10 +260,10 @@ index 5b715f260eb9bdceae9310e1f773890607c62929..ca600d3e8b1f4fae299b1bf3d283c466
 
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 36d73f14d70c4b1768f3b7dfa235a6a2411e4687..cdc0f844c1c2f7c8f0faee9112750354762ec5de 100644
+index e93ce0e0a6cfd7c0596d50a6255151f5ef84b2ce..b310c69b68b5d7c5a1cc15db2ab21bed857bb036 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3887,5 +3887,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3899,5 +3899,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @deprecated Use {@link #resetIdleDuration()} instead
       */
      void resetIdleTimer();

patches/api/0040-Add-death-screen-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index cdc0f844c1c2f7c8f0faee9112750354762ec5de..eb79e62e753524d6782842c662b0a50ab5ac0811 100644
+index b310c69b68b5d7c5a1cc15db2ab21bed857bb036..65260b33a13858309356d573dfa2989b92e7437c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3957,5 +3957,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3969,5 +3969,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Clears all debug block highlights
       */
      void clearBlockHighlights();

patches/api/0043-Fire-Immunity-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fire Immunity API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 8c9c4183785a47b64f084f4b8cdac53d2d4402aa..2d12c70b0baa50504619c8e37881a11a56d7df2c 100644
+index 22713e97e7c7b643b80c07a88ae890d7c4304730..b7d53973ac4e829a03821d59e0b3a28d6f6a4373 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1196,5 +1196,18 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1209,5 +1209,18 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       * @return True if in daylight
       */
      boolean isInDaylight();

patches/server/0001-Pufferfish-Server-Changes.patch

@@ -1367,7 +1367,7 @@ index 8ea2f24695f5dad55e21f238b69442513e7a90c6..5a2f7f7cf79dcbb996574e18cad86ebb
                      this.wasOnGround = this.entity.onGround();
                      this.teleportDelay = 0;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c96f3dcd365bc140b1f4680ef6bd770c80f8eda1..67d4b15143358c8947a7102a325dad66967e73a6 100644
+index f9abf63e12ea930275121b470e4e4906cff0fc12..2a8ffcdd262ea73844500846c6401cdda7153d61 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -715,6 +715,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -2154,7 +2154,7 @@ index 213ee4aa988dd4c2a5a7be99b1d13f67338e5209..8e46753af60aa9fd8e4b4c0f955f7a55
          if (input.ingredientCount() != this.ingredients.size()) {
              return false;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index e2a0487089eb5a7bdc1433e4c75f69d8e9f9d5f9..d3cc65612c44f42ecae2e09b942438a03bc244bd 100644
+index 507671476c3d2d92a2fdb05be24443af27d26dcf..2479b47186202de40cdb4ae773c696a4adee9bad 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1418,16 +1418,16 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -2177,7 +2177,7 @@ index e2a0487089eb5a7bdc1433e4c75f69d8e9f9d5f9..d3cc65612c44f42ecae2e09b942438a0
      }
      // Paper start - Option to prevent armor stands from doing entity lookups
      @Override
-@@ -1944,6 +1944,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -1961,6 +1961,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
      }
 
      public ProfilerFiller getProfiler() {

patches/server/0005-Purpur-client-support.patch

@@ -43,13 +43,13 @@ index 6998f32f8d79dbdb6b31ffaa126602fc4a428616..2bb1c00e350497b425da63e473d7af5c
              try {
                  String channels = payload.toString(com.google.common.base.Charsets.UTF_8);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ad740739437be632fc7fedec488a7d0c49534688..d0020559126163ff44e16023b698ba7181b114bc 100644
+index 42d7660efe5baa6f796f2a7606686c765b6f2478..9e7c447a786bde25bb7ebe58619700b4c2e3d05e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3553,4 +3553,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         ((ca.spottedleaf.moonrise.patches.chunk_system.player.ChunkSystemServerPlayer)this.getHandle())
-             .moonrise$getViewDistanceHolder().setSendViewDistance(viewDistance);
+@@ -3568,4 +3568,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+         this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundEntityEventPacket(((CraftEntity) target).getHandle(), effect.getData()));
      }
+     // Paper end - entity effect API
 +
 +    // Purpur start
 +    @Override

patches/server/0009-Ridables.patch

@@ -34,7 +34,7 @@ index e63721261258dba60b1eef2eee011e0aa18b0fd2..17d81fe18dc859675d9d57fd8f739639
              this.profiler.push(() -> {
                  String s = String.valueOf(worldserver);
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 67d4b15143358c8947a7102a325dad66967e73a6..29c4e56091822c95daa60c7f85f422b09188cbcc 100644
+index 2a8ffcdd262ea73844500846c6401cdda7153d61..5d6530ce4ec32c46c445f9bcd81c658e6a0ad141 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -229,6 +229,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -5090,13 +5090,13 @@ index 55fd997a4e894eeab24de269d59e486196ffbe8d..63f48841c849ff49d9d43efc5de8952c
      public boolean hurt(DamageSource source, float amount) {
          return false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index cd789c235acf740ec29c30b180e7fbe1a140caa9..edaaaf0ecc412504b32fe7481f95e5947e0f922a 100644
+index 89c8713d2c2206d1b0d8c0a392c9d13b3e736f0c..0883ac705b507c839246a50bd99f7230f9f3a56f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1299,4 +1299,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-         return this.getHandle().getScoreboardName();
+@@ -1310,4 +1310,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+         }
      }
-     // Paper end - entity scoreboard name
+     // Paper end - broadcast hurt animation
 +
 +    // Purpur start
 +    @Override

patches/server/0013-AFK-API.patch

@@ -78,7 +78,7 @@ index be4226b968e02fa88deb851ecb76130034e56695..d4a05d40cb15b6b73d12976d3b25d712
          return this.stats;
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cc801cbefbbb54b8f9fa29bb37c00eca8e7ae44b..41f57991c9b42ee71d480f7f04a9007ae6a1d2d4 100644
+index d5267431f0ac8fdf2d474951dde50f29ae7c3895..23d897ef7f0a26ac87f4d90926f9036d47f4f105 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -332,6 +332,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -223,7 +223,7 @@ index 141b748abe80402731cdaf14a3d36aa7cef4f4bd..d5d2a6467b48bcf8e5322dd5938f6e4f
                  if (range < 0.0 || d < range * range) {
                      return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d0020559126163ff44e16023b698ba7181b114bc..8203d8f8fadd2a8c636eb9aa4ccb660e5c3caeb3 100644
+index 9e7c447a786bde25bb7ebe58619700b4c2e3d05e..82b8fca9ca46f24d71b357ed5eab89c6b27ecd8a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -578,10 +578,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -243,7 +243,7 @@ index d0020559126163ff44e16023b698ba7181b114bc..8203d8f8fadd2a8c636eb9aa4ccb660e
          if (this.getHandle().connection == null) return; // Paper - Updates are possible before the player has fully joined
          for (ServerPlayer player : (List<ServerPlayer>) this.server.getHandle().players) {
              if (player.getBukkitEntity().canSee(this)) {
-@@ -3559,5 +3564,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3574,5 +3579,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean usesPurpurClient() {
          return getHandle().purpurClient;
      }

patches/server/0070-Add-allow-water-in-end-world-option.patch

@@ -27,10 +27,10 @@ index 321188173918d0d60858a258400dfd682ccdb21c..af47074f3a61a8518697d7851e43d543
 
                  return true;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 116cfd126df3ed5c6643e70912c0d6a63f4a6eb2..99c58ab01b0a61def3c9b9e39e0fbcf90e600a6c 100644
+index 97f83c9737726be0c3b6dc847b56970e81cc6b6f..df881431c8f32e2c12224b44084ca4d71edf9ab3 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -2027,4 +2027,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -2044,4 +2044,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
          return null;
      }
      // Paper end - optimize redstone (Alternate Current)

patches/server/0121-Add-EntityTeleportHinderedEvent.patch

@@ -71,7 +71,7 @@ index 0fdbcab175b51a8b77646e0e4a267d987b133a35..e8cccf3d89ecef13c0523c2357ef4b07
              EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), pos.getX(), pos.getY(), pos.getZ()), org.bukkit.PortalType.NETHER); // Paper - add portal type
              world.getCraftServer().getPluginManager().callEvent(event);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index edaaaf0ecc412504b32fe7481f95e5947e0f922a..0d497b26eeb53ca65bbb936e2c1bed3d47560ea2 100644
+index 0883ac705b507c839246a50bd99f7230f9f3a56f..af3ab1eb9af64605203e7bb671ff08a38be9e6a6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -245,6 +245,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -83,10 +83,10 @@ index edaaaf0ecc412504b32fe7481f95e5947e0f922a..0d497b26eeb53ca65bbb936e2c1bed3d
          }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8203d8f8fadd2a8c636eb9aa4ccb660e5c3caeb3..9a68ef30a7d1e05599aaa79bdce946aa48a621d4 100644
+index 82b8fca9ca46f24d71b357ed5eab89c6b27ecd8a..9df9b518f6188a758d9a712def36dadb9dd94f21 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1435,6 +1435,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1440,6 +1440,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // Paper start - Teleport passenger API
          // Don't allow teleporting between worlds while keeping passengers
          if (ignorePassengers && entity.isVehicle() && location.getWorld() != this.getWorld()) {

patches/server/0202-Extended-OfflinePlayer-API.patch

@@ -243,10 +243,10 @@ index 4f4e3ee18d586f61706504218cddc06a38ca5580..95cf30c1ded4a46791e1739fbae2d06c
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9a68ef30a7d1e05599aaa79bdce946aa48a621d4..aa2e0d3c0b6c8c1bca3e0c4527a88b1c97a6418c 100644
+index 9df9b518f6188a758d9a712def36dadb9dd94f21..b6db9d9326f30deb02d5530e014bd3abbaf9c54e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2758,6 +2758,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2763,6 +2763,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().getAbilities().walkingSpeed * 2f;
      }