Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@9d0aa8eb Updated Upstream (Paper)

divinemc-api/paper-patches/features/0006-Extend-Sound-API.patch

@@ -39,10 +39,10 @@ index 32f5d2631b6807021c4a810fd577d83a268763a5..d5e4280269fa4588b502df5393834177
 +    // DivineMC end - Extend Sound API
  }
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 3a3c6ab87a164df706f59f6b59bfe977492658d7..b4e319eccfed44bbd5e5c4a540c410462598d433 100644
+index 0674a55826c0f22e7f700e585f7d5ed559151e30..ebf0617f8b78c6884466d6c6420e5a248971a138 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1279,4 +1279,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1306,4 +1306,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      void setImmuneToFire(@Nullable Boolean fireImmune);
      // Purpur end - Fire Immunity API

divinemc-api/paper-patches/features/0008-Paper-PR-Player-standing-on-position-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Paper PR: Player standing on position API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 1eaae9a9e2d73535ddfea355878c61db0f9aa342..0cb9d99f628a9a8b6bd53b5603bd80b176fbc4f4 100644
+index ebf0617f8b78c6884466d6c6420e5a248971a138..9349183dc98a4fbe6cbd79dffe3d21a8c186894e 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1225,6 +1225,33 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1252,6 +1252,33 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
      void broadcastHurtAnimation(@NotNull java.util.Collection<Player> players);
      // Paper end - broadcast hurt animation
  

divinemc-server/minecraft-patches/features/0003-Completely-remove-Mojang-profiler.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Completely remove Mojang profiler
 
 
 diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index 5e39795860916e8e88e1fde45f71693adee3df58..07e228b620962e507b7db70e5a743daf2e5c82ca 100644
+index 603feb73bb5b45eec5984d27d0f5cf98ccc8420c..8cfd050e1b5ebd6725a6888c8ec7aa6ce7c06efe 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
 @@ -55,7 +55,6 @@ import net.minecraft.server.commands.CloneCommands;
@@ -619,10 +619,10 @@ index 467f9af4446168134abd8d9ee1c4e6cc3479d73c..9956405d7f9d14af7278837adeede76d
      public static class TickTimes {
          private final long[] times;
 diff --git a/net/minecraft/server/ReloadableServerResources.java b/net/minecraft/server/ReloadableServerResources.java
-index 84e2b940ab8301b789a01d5b739d69cb50db5bf4..1f0cbaa4be08a5ef675575a752394138863b8132 100644
+index c891715968193f2ab4579b4a2b4aeeae6a210070..7b0cf6cdd0eeaea228380c5960704e632d97de98 100644
 --- a/net/minecraft/server/ReloadableServerResources.java
 +++ b/net/minecraft/server/ReloadableServerResources.java
-@@ -98,7 +98,7 @@ public class ReloadableServerResources {
+@@ -99,7 +99,7 @@ public class ReloadableServerResources {
                              backgroundExecutor,
                              gameExecutor,
                              DATA_RELOAD_INITIAL_TASK,
@@ -1291,7 +1291,7 @@ index 59e8a5e1b35c81883c9b1ca00c6e55d77584d8cc..f5d4f439c3346cc158043ada02094257
          }
  
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index d8a8e6d006d18de5ec148a0d9d6f08a6a40a65bb..2bb5055f2fb1e8b95b2a5d8dba5f1fa0bb5fdec7 100644
+index 56eabc55203756461fc679837b55b30a5c503268..e139b875314686f252127db11536abd7a58ba0f5 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -74,8 +74,6 @@ import net.minecraft.util.Mth;
@@ -1481,10 +1481,10 @@ index d8a8e6d006d18de5ec148a0d9d6f08a6a40a65bb..2bb5055f2fb1e8b95b2a5d8dba5f1fa0
              for (Entity entity : passengerEntity.getPassengers()) {
                  this.tickPassenger(passengerEntity, entity, isActive); // Paper - EAR 2
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 314cf6d2521d371c7630f10a6522e6489db82040..793a2a2aab4c8d21a2a7b84645d43219b66092db 100644
+index 45c7ffb6822e04ef08705396e87c51a8a074bfc2..d5dfd49f3e5039661fe39cc8bf8853c81511c0d0 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -104,8 +104,6 @@ import net.minecraft.util.HashOps;
+@@ -103,8 +103,6 @@ import net.minecraft.util.HashOps;
  import net.minecraft.util.Mth;
  import net.minecraft.util.RandomSource;
  import net.minecraft.util.Unit;
@@ -1493,7 +1493,7 @@ index 314cf6d2521d371c7630f10a6522e6489db82040..793a2a2aab4c8d21a2a7b84645d43219
  import net.minecraft.world.Container;
  import net.minecraft.world.Difficulty;
  import net.minecraft.world.InteractionHand;
-@@ -1405,14 +1403,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1415,14 +1413,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
                  this.unsetRemoved();
                  */
                  // CraftBukkit end
@@ -1508,7 +1508,7 @@ index 314cf6d2521d371c7630f10a6522e6489db82040..793a2a2aab4c8d21a2a7b84645d43219
                  // CraftBukkit start
                  this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
                  LevelData worlddata = level.getLevelData();
-@@ -1430,7 +1424,6 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1440,7 +1434,6 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
                  this.connection.internalTeleport(PositionMoveRotation.of(teleportTransition), teleportTransition.relatives()); // CraftBukkit - use internal teleport without event
                  this.connection.resetPosition();
                  level.addDuringTeleport(this);
@@ -4008,7 +4008,7 @@ index 39a604c9a53930b53d959b1d2eb504aa964e9a58..0d0380e3955836ce125f777841477503
  
      @Override
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index bf440407548c6b1ff906c26adcb102f42b3286d5..02adfa3f0ddd86be320156ff18b8e5af5071811b 100644
+index 8a319e381e93c0ac1c375fd5d3fa965d0413b44b..6b50a3fc0476f4b9941f1e66fb3f2a79042e33aa 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -82,8 +82,6 @@ import net.minecraft.tags.FluidTags;
@@ -4081,7 +4081,7 @@ index bf440407548c6b1ff906c26adcb102f42b3286d5..02adfa3f0ddd86be320156ff18b8e5af
              }
          }
          // Paper start - detailed watchdog information
-@@ -3258,8 +3246,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3274,8 +3262,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              this.processPortalCooldown();
              if (this.portalProcess != null) {
                  if (this.portalProcess.processPortalTeleportation(serverLevel, this, this.canUsePortal(false))) {
@@ -4090,7 +4090,7 @@ index bf440407548c6b1ff906c26adcb102f42b3286d5..02adfa3f0ddd86be320156ff18b8e5af
                      this.setPortalCooldown();
                      TeleportTransition portalDestination = this.portalProcess.getPortalDestination(serverLevel, this);
                      if (portalDestination != null) {
-@@ -3269,8 +3255,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3285,8 +3271,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                              this.teleport(portalDestination);
                          }
                      }
@@ -4099,7 +4099,7 @@ index bf440407548c6b1ff906c26adcb102f42b3286d5..02adfa3f0ddd86be320156ff18b8e5af
                  } else if (this.portalProcess.hasExpired()) {
                      this.portalProcess = null;
                  }
-@@ -3825,15 +3809,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3841,15 +3825,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              entity.teleport(this.calculatePassengerTransition(teleportTransition, entity));
          }
  
@@ -4115,7 +4115,7 @@ index bf440407548c6b1ff906c26adcb102f42b3286d5..02adfa3f0ddd86be320156ff18b8e5af
          return this;
      }
  
-@@ -3849,11 +3830,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3865,11 +3846,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              }
          }
  
@@ -4127,7 +4127,7 @@ index bf440407548c6b1ff906c26adcb102f42b3286d5..02adfa3f0ddd86be320156ff18b8e5af
              return null;
          } else {
              // Paper start - Fix item duplication and teleport issues
-@@ -3872,7 +3850,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3888,7 +3866,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
  
              level.resetEmptyTime();
              teleportTransition.postTeleportTransition().onTransition(entityx);

divinemc-server/minecraft-patches/features/0008-Misc-Optimizations.patch

@@ -193,7 +193,7 @@ index bee90335677f7d8b01589ce5cfd81a40fd422886..a5e488d14fd2016ee188b114d0e68156
  
      public record Positioned(ChunkPos center, int viewDistance) implements ChunkTrackingView {
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 8fa3af0ebcb92138d0dae858c131db0a710df693..6268bfc05fd9d3669bef20a1ddc5477fbae0f957 100644
+index 2f69b1e05ef258d6b28ee912167b8a5bb83fc703..6ed2d1aeab17941b67019d45734da46efc53ffdf 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -1312,13 +1312,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -565,7 +565,7 @@ index a18240418a19a95147341a634527d774f3d5bb92..66f74ad2a194a6676574da2932cf4677
      public DebugSampleSubscriptionTracker(PlayerList playerList) {
          this.playerList = playerList;
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 02adfa3f0ddd86be320156ff18b8e5af5071811b..28a4473c1c49098d670031026cc2a52a19214157 100644
+index 6b50a3fc0476f4b9941f1e66fb3f2a79042e33aa..1fdbd88841993e377ea2e14b40d059dd220a1878 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -149,7 +149,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -620,7 +620,7 @@ index 02adfa3f0ddd86be320156ff18b8e5af5071811b..28a4473c1c49098d670031026cc2a52a
      }
  
      private void applyMovementEmissionAndPlaySound(Entity.MovementEmission movementEmission, Vec3 movement, BlockPos pos, BlockState state) {
-@@ -4503,10 +4477,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4519,10 +4493,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
  
      // Paper start - optimise collisions
      public boolean updateFluidHeightAndDoFluidPushing(final TagKey<Fluid> fluid, final double flowScale) {
@@ -631,7 +631,7 @@ index 02adfa3f0ddd86be320156ff18b8e5af5071811b..28a4473c1c49098d670031026cc2a52a
          final AABB boundingBox = this.getBoundingBox().deflate(1.0E-3);
  
          final Level world = this.level;
-@@ -4542,7 +4512,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4558,7 +4528,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
  
          for (int currChunkZ = minChunkZ; currChunkZ <= maxChunkZ; ++currChunkZ) {
              for (int currChunkX = minChunkX; currChunkX <= maxChunkX; ++currChunkX) {
@@ -644,7 +644,7 @@ index 02adfa3f0ddd86be320156ff18b8e5af5071811b..28a4473c1c49098d670031026cc2a52a
  
                  // bound y
                  for (int currChunkY = minChunkY; currChunkY <= maxChunkY; ++currChunkY) {
-@@ -4699,9 +4673,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4715,9 +4689,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public void setDeltaMovement(Vec3 deltaMovement) {
@@ -654,7 +654,7 @@ index 02adfa3f0ddd86be320156ff18b8e5af5071811b..28a4473c1c49098d670031026cc2a52a
      }
  
      public void addDeltaMovement(Vec3 addend) {
-@@ -4809,9 +4781,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4825,9 +4797,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          }
          // Paper end - Fix MC-4
          if (this.position.x != x || this.position.y != y || this.position.z != z) {

divinemc-server/minecraft-patches/features/0030-Configurable-MC-67.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable MC-67
 
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 28a4473c1c49098d670031026cc2a52a19214157..7c0d9fa1f98d25fe3271a054a3da98e94fd9da52 100644
+index 1fdbd88841993e377ea2e14b40d059dd220a1878..5bddb09d1b822251fc7106d22c1e26bf5abcbd3c 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -3936,6 +3936,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3952,6 +3952,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public boolean canTeleport(Level fromLevel, Level toLevel) {

divinemc-server/minecraft-patches/features/0043-Parallel-world-ticking.patch

@@ -228,7 +228,7 @@ index 3f9b26de801b2d8e85c56d219ca7bd61c41b3f9d..8fa8cd1a06c86c8424d43b588ff13a91
          this.setFlightAllowed(properties.allowFlight);
          this.setMotd(properties.motd);
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 04ef12b1cff4d7baf0835b48825db82b2657123e..86d4a41195ade54c2bdc8b44141a458337cc98bc 100644
+index 9db7c44f4d5985460510e11aa7060109ed51481a..b609361d4ff1d42d3ac40411013de767ad8665d7 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -179,7 +179,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -316,10 +316,10 @@ index 04ef12b1cff4d7baf0835b48825db82b2657123e..86d4a41195ade54c2bdc8b44141a4583
          // Paper start - extra debug info
          if (entity.valid) {
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 793a2a2aab4c8d21a2a7b84645d43219b66092db..d3fa8ef2e450999821b709cc0809623bc0eb8e2c 100644
+index d5dfd49f3e5039661fe39cc8bf8853c81511c0d0..9e58eb6d4c554c707456e29b9b3191013ffc727e 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -460,6 +460,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -459,6 +459,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
          return this.viewDistanceHolder;
      }
      // Paper end - rewrite chunk system
@@ -327,7 +327,7 @@ index 793a2a2aab4c8d21a2a7b84645d43219b66092db..d3fa8ef2e450999821b709cc0809623b
  
      public ServerPlayer(MinecraftServer server, ServerLevel level, GameProfile gameProfile, ClientInformation clientInformation) {
          super(level, level.getSharedSpawnPos(), level.getSharedSpawnAngle(), gameProfile);
-@@ -753,6 +754,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -752,6 +753,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
  
      @Override
      public void tick() {
@@ -335,7 +335,7 @@ index 793a2a2aab4c8d21a2a7b84645d43219b66092db..d3fa8ef2e450999821b709cc0809623b
          // CraftBukkit start
          if (this.joining) {
              this.joining = false;
-@@ -1392,6 +1394,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1402,6 +1404,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
                  return this;
              } else {
                  // CraftBukkit start
@@ -343,7 +343,7 @@ index 793a2a2aab4c8d21a2a7b84645d43219b66092db..d3fa8ef2e450999821b709cc0809623b
                  /*
                  this.isChangingDimension = true;
                  LevelData levelData = level.getLevelData();
-@@ -1733,6 +1736,12 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1743,6 +1746,12 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
                  return OptionalInt.empty();
              } else {
                  // CraftBukkit start
@@ -356,7 +356,7 @@ index 793a2a2aab4c8d21a2a7b84645d43219b66092db..d3fa8ef2e450999821b709cc0809623b
                  this.containerMenu = abstractContainerMenu; // Moved up
                  if (!this.isImmobile())
                  this.connection
-@@ -1797,6 +1806,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1807,6 +1816,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
      }
      @Override
      public void closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason reason) {
@@ -404,10 +404,10 @@ index 9f3afab438199dbaf40fa1a64b6ecdae74c0a34d..8923a30daf515262e4bdbfbd55e3cb82
          serverPlayer.connection = player.connection;
          serverPlayer.restoreFrom(player, keepInventory);
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 4ffccdb6295d850e1e089633f2ee85c2c6f5fd47..c6accc73532be89b9c3c2115a2d784b7636af6bc 100644
+index d31e4f190cee68883ca48b94524fb356738a4125..28fc134b5a567b53024bc2cdc6fc363eb14c37ff 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -3223,14 +3223,34 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3239,14 +3239,34 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              if (this.portalProcess != null) {
                  if (this.portalProcess.processPortalTeleportation(serverLevel, this, this.canUsePortal(false))) {
                      this.setPortalCooldown();
@@ -448,7 +448,7 @@ index 4ffccdb6295d850e1e089633f2ee85c2c6f5fd47..c6accc73532be89b9c3c2115a2d784b7
                  } else if (this.portalProcess.hasExpired()) {
                      this.portalProcess = null;
                  }
-@@ -3795,6 +3815,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3811,6 +3831,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      private Entity teleportCrossDimension(ServerLevel level, TeleportTransition teleportTransition) {

divinemc-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -2185,6 +_,7 @@
+@@ -2195,6 +_,7 @@
              this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, gameMode.getId()));
              if (gameMode == GameType.SPECTATOR) {
                  this.removeEntitiesOnShoulder();

divinemc-server/paper-patches/features/0006-Skip-EntityScheduler-s-executeTick-checks-if-there-i.patch

@@ -68,10 +68,10 @@ index c03608fec96b51e1867f43d8f42e5aefb1520e46..eda35b81c36ca8ebe4f9487cb41e2b0c
                  throw new IllegalStateException("Ticking retired scheduler");
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 8feb78c4d7fa793f01991756b618fc49de023db6..a138a364c73bc0b325391c9f30943769e54e4cda 100644
+index efcd7e52bfda50970054a37f8c98452e5306c66a..5899df5367bbbdce87d34f4790b11e84df95f0d3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -83,7 +83,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -84,7 +84,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      private final CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(CraftEntity.DATA_TYPE_REGISTRY);
      protected net.kyori.adventure.pointer.Pointers adventure$pointers; // Paper - implement pointers
      // Paper start - Folia shedulers
@@ -80,7 +80,7 @@ index 8feb78c4d7fa793f01991756b618fc49de023db6..a138a364c73bc0b325391c9f30943769
      private final io.papermc.paper.threadedregions.scheduler.FoliaEntityScheduler apiScheduler = new io.papermc.paper.threadedregions.scheduler.FoliaEntityScheduler(this);
  
      @Override
-@@ -96,6 +96,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -97,6 +97,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          this.server = server;
          this.entity = entity;
          this.entityType = CraftEntityType.minecraftToBukkit(entity.getType());

divinemc-server/paper-patches/features/0012-Paper-PR-Player-standing-on-position-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Paper PR: Player standing on position API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index a138a364c73bc0b325391c9f30943769e54e4cda..e84408d1a64dbaba1500ee4d31df964d258f058f 100644
+index 5899df5367bbbdce87d34f4790b11e84df95f0d3..7e4196728985e81b40b52b370b63834553b42126 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1314,6 +1314,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1327,6 +1327,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return this.entity.get(io.papermc.paper.datacomponent.PaperDataComponentType.bukkitToMinecraft(type)) != null;
      }
  

gradle.properties

@@ -2,7 +2,7 @@ group = org.bxteam.divinemc
 version=1.21.5-R0.1-SNAPSHOT
 
 mcVersion=1.21.5
-purpurRef=a9fe4f259771306c2977e1fb4e9fbcb515abacd3
+purpurRef=9d0aa8ebdea1f49d3828fe0e5c85effa8c658d1a
 experimental=true
 
 org.gradle.configuration-cache=true