Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@5fca3ae update generated API
PaperMC/Paper@188cff2 remove old vanilla goals
PaperMC/Paper@ffe310a remove api that was scheduled for removal

gradle.properties

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21-R0.1-SNAPSHOT
 
 mcVersion = 1.21
-paperCommit = f5693896c5d0a3116efedcc730896be2c727038d
+paperCommit = ffe310a8e1dd4ed1027e903b4683f0ab42ee9ff8
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0035-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 fdb87adfb8d6eff2bfabe7a41398c53d15d4cd98..25a049040a982194e7337d283898b252568f09e0 100644
+index d8a23aa0d898ca3360757721e38ddb97387f7d21..5b715f260eb9bdceae9310e1f773890607c62929 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4276,6 +4276,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4145,6 +4145,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      public DragonBattle getEnderDragonBattle();
 

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

@@ -179,10 +179,10 @@ index cb20702273cfb21dbd00f93138c166f018d75971..ceb81148f5fd17f00d1a0fb2df1f31c4
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 25a049040a982194e7337d283898b252568f09e0..0f2f7cb8acb226d6f9a1085ec9cac3f8faa77813 100644
+index 5b715f260eb9bdceae9310e1f773890607c62929..ca600d3e8b1f4fae299b1bf3d283c466c18875a6 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4284,6 +4284,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4153,6 +4153,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       * @return The local difficulty
       */
      public float getLocalDifficultyAt(@NotNull Location location);

patches/server/0010-AFK-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 720f96ab9fd525f5a97302da24b68509fb45eb84..152b80e1c7402dd02c71ca7c6f6e70bdab6bd88b 100644
+index cd279da8ecd6fcf004bebf72f9c390a433cfeeda..f7a5a73a6dc8e239a97701855363d8906cfa13b4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2333,8 +2333,68 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -2332,8 +2332,68 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
 
      public void resetLastActionTime() {
          this.lastActionTime = Util.getMillis();

patches/server/0068-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b86bdf61be2776352dd6c59b66ecfcee269f8e51..ec77e834d5f21c64aaf5ac8425fb1b42859b22e8 100644
+index f276c8b6b60ee9c3ad8924b52df53f0f1ea5a087..2a667207629a36d96c6f9a36e7acb9d1ecbab9dc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2992,4 +2992,26 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -2991,4 +2991,26 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
          return (CraftPlayer) super.getBukkitEntity();
      }
      // CraftBukkit end

patches/server/0109-Implement-TPSBar.patch

@@ -41,7 +41,7 @@ index 36351e029c55ccd67b460e90f8c74e3d87f8ae5a..70b0d8f18df7380d54a9c28e0d906096
          }
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d45990c793cd11a1e443af59738d47a21877f417..20fcf96f5cc89631cc993168f009e91c5bd57c48 100644
+index 69c99aec32b89c3966eac70f636d70756b6b57d0..25ffc18a6f00abcd6e2782b7977307c6db4748ec 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -297,6 +297,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -68,7 +68,7 @@ index d45990c793cd11a1e443af59738d47a21877f417..20fcf96f5cc89631cc993168f009e91c
      }
 
      // CraftBukkit start - World fallback code, either respawn location or global spawn
-@@ -3022,5 +3025,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -3021,5 +3024,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
              this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.DEATH);
          }
      }
@@ -83,7 +83,7 @@ index d45990c793cd11a1e443af59738d47a21877f417..20fcf96f5cc89631cc993168f009e91c
      // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 09595bbd536fc84d309163923317a860f606ea7c..b6289dbad3d2a840dfef9505127a343f032f1da5 100644
+index c7aa9b26bfb67d889d8a95daa77142ae6ad12463..c6705a337844ee79a13ce4acddb9c9fba78b1206 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -480,6 +480,7 @@ public abstract class PlayerList {

patches/server/0181-Add-compass-command.patch

@@ -17,7 +17,7 @@ index a9180b1ce021f6d4d60e43bc04e863be99daf9d3..89cfef3a5c466a8f508cce1aa37ec6b0
 
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 598af66601624687f000b74307863e18a56faa27..3dff1bb3a847cf121155b815cd9b6491b50029c5 100644
+index 2ebfedffe3965ff73e4a6413d1129d655066217b..006491715c0a7458e287d316c7b345e37deba553 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -298,6 +298,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -44,7 +44,7 @@ index 598af66601624687f000b74307863e18a56faa27..3dff1bb3a847cf121155b815cd9b6491
      }
 
      // CraftBukkit start - World fallback code, either respawn location or global spawn
-@@ -3046,5 +3049,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -3045,5 +3048,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
      public void tpsBar(boolean tpsBar) {
          this.tpsBar = tpsBar;
      }

patches/server/0242-Add-local-difficulty-api.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add local difficulty api
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index fc38d65914143aaf93aa85badf3adcdfe4dda1b5..adb914317183148ecab6c8ab7c4ce65d3400434e 100644
+index 8f88ccec6b8947ca2738dc07c23aebe258145c83..977d6563ed393ec2db343e6aebce721f96b883d7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2373,6 +2373,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2325,6 +2325,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight());
      }
 

patches/server/0246-Debug-Marker-API.patch

@@ -52,10 +52,10 @@ index 8632ef169eab32caca3a6d89011c37e81345b7d0..dedf510a5942aaa65a606d108d4082e8
 
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index adb914317183148ecab6c8ab7c4ce65d3400434e..415c87f2ead5cfa5f8d63d125596aa60581c561a 100644
+index 977d6563ed393ec2db343e6aebce721f96b883d7..c16dcd753325961e9b85c30ff66edc40af727273 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2377,6 +2377,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2329,6 +2329,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      public float getLocalDifficultyAt(Location location) {
          return getHandle().getCurrentDifficultyAt(io.papermc.paper.util.MCUtil.toBlockPosition(location)).getEffectiveDifficulty();
      }

patches/server/0250-Implement-ram-and-rambar-commands.patch

@@ -18,7 +18,7 @@ index 89cfef3a5c466a8f508cce1aa37ec6b01432eb35..7bcc0f87337547f8783dd9cc8adff611
 
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 30e642f51bbaae3a96c714a99dda43ca60cc374c..3f414fe2ead0f3ba44f48bf5d6555c65a629c447 100644
+index aee38e8a22fb12b55d0fce130f759154712847b4..d990ba31689294e78b60114f3e73ce4be0924c84 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -299,6 +299,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -45,7 +45,7 @@ index 30e642f51bbaae3a96c714a99dda43ca60cc374c..3f414fe2ead0f3ba44f48bf5d6555c65
          nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
          nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
      }
-@@ -3058,5 +3061,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -3057,5 +3060,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
      public void compassBar(boolean compassBar) {
          this.compassBar = compassBar;
      }