Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@f0298536 Fix allowEnteringNetherUsingPortals gamerule not being respected (#13263)
PaperMC/Paper@8e5e54f5 Add Waypoint Styling API (#12964)

gradle.properties

@@ -3,7 +3,7 @@ version = 1.21.11-R0.1-SNAPSHOT
 
 mcVersion = 1.21.11
 apiVersion=1.21.11
-paperCommit = 1f94f1f7af8204ec7bbd94f7b0c1a8ba5fcf5ba8
+paperCommit = 8e5e54f5664c19096ec1a3040dc038bab4fb306b
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true

purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/LivingEntity.java.patch

@@ -1,10 +1,10 @@
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1494,4 +_,20 @@
+@@ -1538,4 +_,20 @@
       */
-     @ApiStatus.Experimental
+     @Nullable
-     @NotNull CombatTracker getCombatTracker();
+     Color getWaypointColor();
-+
++    
 +    // Purpur start - API for any mob to burn daylight
 +    /**
 +     * If this mob will burn in the sunlight

purpur-server/minecraft-patches/features/0001-Ridables.patch

@@ -75,7 +75,7 @@ index cd7ecd971b5a0ffdf6cabeaa874f2a221431052e..e587414dd1250b14a0fecf8d1b25dd70
                                      if (itemType == Items.WATER_BUCKET && target instanceof net.minecraft.world.entity.animal.Bucketable && target instanceof LivingEntity && resendData) {
                                          target.resendPossiblyDesyncedEntityData(ServerGamePacketListenerImpl.this.player); // Paper - The entire mob gets deleted, so resend it
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 33d2e32880653713da8543c6f6dd1748464474dd..406bc2db911e06bd516f852aed1d72dbdc9ff10e 100644
+index 1f0d0b203a476abb4a9ca223558b3639f15f4f54..497d24540273a1ab5301f4efb8ef66c912f93d8e 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -3373,6 +3373,13 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
@@ -107,7 +107,7 @@ index 33d2e32880653713da8543c6f6dd1748464474dd..406bc2db911e06bd516f852aed1d72db
              if (this.passengers.size() == 1 && this.passengers.get(0) == passenger) {
                  this.passengers = ImmutableList.of();
              } else {
-@@ -5464,4 +5479,44 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -5463,4 +5478,44 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
          return ((ServerLevel) this.level()).isPositionEntityTicking(this.blockPosition());
      }
      // Paper end - Expose entity id counter

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch

@@ -127,7 +127,7 @@
              }
          }
      }
-@@ -3687,7 +_,7 @@
+@@ -3686,7 +_,7 @@
      }
  
      public int getMaxAirSupply() {
@@ -136,7 +136,7 @@
      }
  
      public int getAirSupply() {
-@@ -4222,7 +_,7 @@
+@@ -4221,7 +_,7 @@
      }
  
      public boolean canUsePortal(boolean allowPassengers) {
@@ -145,7 +145,7 @@
      }
  
      public boolean canTeleport(Level fromLevel, Level toLevel) {
-@@ -4741,6 +_,12 @@
+@@ -4740,6 +_,12 @@
          return Mth.lerp(partialTick, this.yRotO, this.yRot);
      }
  
@@ -158,7 +158,7 @@
      // Paper start - optimise collisions
      public boolean updateFluidHeightAndDoFluidPushing(final TagKey<Fluid> fluid, final double flowScale) {
          if (this.touchingUnloadedChunk()) {
-@@ -5161,7 +_,7 @@
+@@ -5160,7 +_,7 @@
      }
  
      public float maxUpStep() {

purpur-server/paper-patches/features/0004-API-for-any-mob-to-burn-daylight.patch

@@ -24,12 +24,12 @@ index da588e4622aac635ecc2205ea09ceb9722cd59c9..d04ff11b293c458fd4f18f04336421e5
          Preconditions.checkArgument(entity != null, "Unknown entity");
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index d9129420acaf992c36e171d1b6d399a4b322fea6..d64c10a86a63dac5ce9babcd826e2ecc83b08423 100644
+index 4f31c5604639b4699631449569ba73d064f83dc3..2eeb96681ac9bbc8ba2cba2dfe1cef4a7e61e500 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1088,4 +1088,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1132,4 +1132,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-     public CombatTracker getCombatTracker() {
+         manager.untrackWaypoint(getHandle());
-         return this.getHandle().getCombatTracker().paperCombatTracker;
+         manager.trackWaypoint(getHandle());
      }
 +
 +    // Purpur start - API for any mob to burn daylight

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -482,7 +_,7 @@
+@@ -490,7 +_,7 @@
          net.minecraft.server.level.ServerPlayer nmsKiller = killer == null ? null : ((CraftPlayer) killer).getHandle();
          this.getHandle().setLastHurtByMob(nmsKiller);
          if (nmsKiller != null) {