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)

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() {