diff --git a/paper-server/patches/features/0001-Moonrise-optimisation-patches.patch b/paper-server/patches/features/0001-Moonrise-optimisation-patches.patch
index 8025d316f200..4511dc554575 100644
--- a/paper-server/patches/features/0001-Moonrise-optimisation-patches.patch
+++ b/paper-server/patches/features/0001-Moonrise-optimisation-patches.patch
@@ -28126,7 +28126,7 @@ index 8cc5c0716392ba06501542ff5cbe71ee43979e5d..09fd99c9cbd23b5f3c899bfb00c9b896
 +    // Paper end - block counting
  }
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 493bd67c03ef3724ff3b491617339fab7f12ed30..1f6576fea282cc68d5192019fc7d5dabc3703c43 100644
+index 159a2392c7e080da7bc1052ed31eb5964ffe205e..9ba74df17cad8b5039e4657d97daefae8c3524e9 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -152,7 +152,7 @@ import org.jetbrains.annotations.Contract;
@@ -28479,7 +28479,7 @@ index 493bd67c03ef3724ff3b491617339fab7f12ed30..1f6576fea282cc68d5192019fc7d5dab
      }
  
      private static float[] collectCandidateStepUpHeights(AABB box, List<VoxelShape> colliders, float deltaY, float maxUpStep) {
-@@ -2711,21 +2859,110 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -2713,21 +2861,110 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
      }
  
      public boolean isInWall() {
@@ -28601,7 +28601,7 @@ index 493bd67c03ef3724ff3b491617339fab7f12ed30..1f6576fea282cc68d5192019fc7d5dab
      }
  
      public InteractionResult interact(Player player, InteractionHand hand) {
-@@ -4316,15 +4553,17 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4318,15 +4555,17 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
      }
  
      public Iterable<Entity> getIndirectPassengers() {
@@ -28627,7 +28627,7 @@ index 493bd67c03ef3724ff3b491617339fab7f12ed30..1f6576fea282cc68d5192019fc7d5dab
      }
  
      public int countPlayerPassengers() {
-@@ -4473,77 +4712,126 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4475,77 +4714,126 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
          return Mth.lerp(partialTick, this.yRotO, this.yRot);
      }
  
@@ -28812,7 +28812,7 @@ index 493bd67c03ef3724ff3b491617339fab7f12ed30..1f6576fea282cc68d5192019fc7d5dab
  
      public boolean touchingUnloadedChunk() {
          AABB aabb = this.getBoundingBox().inflate(1.0);
-@@ -4703,6 +4991,15 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4705,6 +4993,15 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
      }
  
      public final void setPosRaw(double x, double y, double z, boolean forceBoundingBoxUpdate) {
@@ -28828,7 +28828,7 @@ index 493bd67c03ef3724ff3b491617339fab7f12ed30..1f6576fea282cc68d5192019fc7d5dab
          if (!checkPosition(this, x, y, z)) {
              return;
          }
-@@ -4852,6 +5149,12 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4854,6 +5151,12 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
  
      @Override
      public final void setRemoved(Entity.RemovalReason removalReason, org.bukkit.event.entity.EntityRemoveEvent.@Nullable Cause cause) { // CraftBukkit - add Bukkit remove cause
@@ -28841,7 +28841,7 @@ index 493bd67c03ef3724ff3b491617339fab7f12ed30..1f6576fea282cc68d5192019fc7d5dab
          org.bukkit.craftbukkit.event.CraftEventFactory.callEntityRemoveEvent(this, cause); // CraftBukkit
          final boolean alreadyRemoved = this.removalReason != null; // Paper - Folia schedulers
          if (this.removalReason == null) {
-@@ -4862,7 +5165,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4864,7 +5167,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
              this.stopRiding();
          }
  
@@ -28850,7 +28850,7 @@ index 493bd67c03ef3724ff3b491617339fab7f12ed30..1f6576fea282cc68d5192019fc7d5dab
          this.levelCallback.onRemove(removalReason);
          this.onRemoval(removalReason);
          // Paper start - Folia schedulers
-@@ -4896,7 +5199,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4898,7 +5201,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
      public boolean shouldBeSaved() {
          return (this.removalReason == null || this.removalReason.shouldSave())
              && !this.isPassenger()
diff --git a/paper-server/patches/features/0005-Entity-Activation-Range-2.0.patch b/paper-server/patches/features/0005-Entity-Activation-Range-2.0.patch
index 55053a124139..90e87c807793 100644
--- a/paper-server/patches/features/0005-Entity-Activation-Range-2.0.patch
+++ b/paper-server/patches/features/0005-Entity-Activation-Range-2.0.patch
@@ -464,7 +464,7 @@ index 5461bd9a39bb20ad29d3bc110c38860cf35a770a..75f80787966cdda6f51f55a8f6cb2218
      public void tick() {
          super.tick();
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 1f6576fea282cc68d5192019fc7d5dabc3703c43..edb47c2f3b3f4b3180f51e616ed1e633dcf96e43 100644
+index 9ba74df17cad8b5039e4657d97daefae8c3524e9..e683302032e1fb4e38eb674472ef7fd22c7ae6e8 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -368,6 +368,15 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
diff --git a/paper-server/patches/features/0007-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/paper-server/patches/features/0007-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 028ebc23a06c..79957e9faa04 100644
--- a/paper-server/patches/features/0007-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/paper-server/patches/features/0007-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
@@ -154,7 +154,7 @@ index 674966c580220a4e0c83a628c763aaea8bfd0b1c..859b859d29b637200cf7c9a0bd52d9f7
  
      public void setControlFlag(Goal.Flag flag, boolean enabled) {
 diff --git a/net/minecraft/world/entity/ai/goal/WrappedGoal.java b/net/minecraft/world/entity/ai/goal/WrappedGoal.java
-index d0249ae3fee041245445a087dee2bb15a4067fc6..44a7c97164ac7ee731068f909372218350a8682d 100644
+index 4bdbd323b642ed3422948fe24780be8b503602dc..2c2ab6a1df9d3d23773e44ce4041cc1c21b55163 100644
 --- a/net/minecraft/world/entity/ai/goal/WrappedGoal.java
 +++ b/net/minecraft/world/entity/ai/goal/WrappedGoal.java
 @@ -69,7 +69,7 @@ public class WrappedGoal extends Goal {
diff --git a/paper-server/patches/features/0009-Handle-Oversized-block-entities-in-chunks.patch b/paper-server/patches/features/0009-Handle-Oversized-block-entities-in-chunks.patch
index 2b04a30e0fb3..d1f3ce49f7b9 100644
--- a/paper-server/patches/features/0009-Handle-Oversized-block-entities-in-chunks.patch
+++ b/paper-server/patches/features/0009-Handle-Oversized-block-entities-in-chunks.patch
@@ -9,7 +9,7 @@ creating too large of a packet to sed.
 Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
 
 diff --git a/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
-index 7cdac4a18b13805aea60495d369ee7cdd1db784f..919eaac837298c1936ec7aa06375c72a7acd2daa 100644
+index de234f220ba09ad9b5e0c8215b49d20ca51d0ac7..e216a9d70be5a3da7c03ee99a8986391ef2dbd5b 100644
 --- a/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
 +++ b/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
 @@ -32,6 +32,14 @@ public class ClientboundLevelChunkPacketData {
@@ -47,7 +47,7 @@ index 7cdac4a18b13805aea60495d369ee7cdd1db784f..919eaac837298c1936ec7aa06375c72a
          }
      }
 diff --git a/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java b/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java
-index 8475c1c3d79e7fae9ab83dea1ac18f7a28ff60bb..3c0f0a612cc57c9f03abfb0ccb1f891305d03d45 100644
+index 3a384175f8e7f204234bbaf3081bdc20c47a0d4b..fdd164cd45a26c7ef25f1153ab8985ba50c01b14 100644
 --- a/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java
 +++ b/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java
 @@ -71,4 +71,11 @@ public class ClientboundLevelChunkWithLightPacket implements Packet<ClientGamePa
diff --git a/paper-server/patches/features/0023-Optimise-collision-checking-in-player-move-packet-ha.patch b/paper-server/patches/features/0023-Optimise-collision-checking-in-player-move-packet-ha.patch
index 68d012e17583..af17a0f5dabd 100644
--- a/paper-server/patches/features/0023-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/paper-server/patches/features/0023-Optimise-collision-checking-in-player-move-packet-ha.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise collision checking in player move packet handling
 Move collision logic to just the hasNewCollision call instead of getCubes + hasNewCollision
 
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 96f1ffabd7d5e60f6d843cf5081f4f137c07ee99..59b664b69b68313d02d06d952ea9d2e6d602500f 100644
+index a778e994c6cdfedd0f3574b7a27f2387af11d5b2..1feb7e47b3aeb840676cf90ed3f62a42f4b03306 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -623,6 +623,7 @@ public class ServerGamePacketListenerImpl
diff --git a/paper-server/patches/features/0025-Optimise-EntityScheduler-ticking.patch b/paper-server/patches/features/0025-Optimise-EntityScheduler-ticking.patch
index 554eb743d6f7..b338e4392bb6 100644
--- a/paper-server/patches/features/0025-Optimise-EntityScheduler-ticking.patch
+++ b/paper-server/patches/features/0025-Optimise-EntityScheduler-ticking.patch
@@ -67,10 +67,10 @@ index 47f34dfddfb1cce87e08c9eb93ad5b2b23c1075b..9934055a994c10d646d97a2d042d0e8b
          io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.DIALOG_CLICK_MANAGER.handleQueue(this.tickCount); // Paper
          profilerFiller.push("commandFunctions");
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index edb47c2f3b3f4b3180f51e616ed1e633dcf96e43..ad4322950726f86e250927f097a4214ed25ddce0 100644
+index e683302032e1fb4e38eb674472ef7fd22c7ae6e8..5b0a22b637841e2fdaa52396c6490936e3e1cd23 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -5216,6 +5216,11 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -5218,6 +5218,11 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
          this.getBukkitEntity().taskScheduler.retire();
      }
      // Paper end - Folia schedulers
diff --git a/paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch b/paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch
index 1e3fd0e2ee7d..c5d57f57fb74 100644
--- a/paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch
@@ -760,17 +760,20 @@
              output.storeNullable("CustomName", ComponentSerialization.CODEC, this.getCustomName());
              if (this.isCustomNameVisible()) {
                  output.putBoolean("CustomNameVisible", this.isCustomNameVisible());
-@@ -1998,9 +_,12 @@
+@@ -1998,9 +_,14 @@
                  output.putInt("TicksFrozen", this.getTicksFrozen());
              }
  
 -            if (this.hasVisualFire) {
 -                output.putBoolean("HasVisualFire", this.hasVisualFire);
+-            }
 +            // Paper start - improve visual fire API
 +            if (this.visualFire.equals(net.kyori.adventure.util.TriState.TRUE)) {
 +                output.putBoolean("HasVisualFire", true);
-             }
-+            output.putString("Paper.FireOverride", visualFire.name());
++            }
++            if (this.visualFire != net.kyori.adventure.util.TriState.NOT_SET) {
++                output.putString("Paper.FireOverride", visualFire.name());
++            }
 +            // Paper end
  
              if (!this.tags.isEmpty()) {