diff --git a/patches/server/0015-Optimise-paper-explosions.patch b/patches/server/0015-Optimise-paper-explosions.patch
index 9e6e753..e8237fe 100644
--- a/patches/server/0015-Optimise-paper-explosions.patch
+++ b/patches/server/0015-Optimise-paper-explosions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimise paper explosions
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 798b840af2dc5f58e6df55426a1802d79ff5d6cb..23549ea6ad18812e76f5d889d73cc143656842d0 100644
+index 798b840af2dc5f58e6df55426a1802d79ff5d6cb..94636b235eac944b955944425b44b9e864a319d0 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -100,7 +100,7 @@ public class Explosion {
@@ -69,7 +69,7 @@ index 798b840af2dc5f58e6df55426a1802d79ff5d6cb..23549ea6ad18812e76f5d889d73cc143
 +        this.clearBlockCache();
 +    }
 +
-+    protected final void searchForBlocks(final ca.spottedleaf.moonrise.patches.collisions.ExplosionBlockCache[] blockCache, final ca.spottedleaf.moonrise.patches.collisions.ExplosionBlockCache initialCache) {
++    protected final void searchForBlocks(ca.spottedleaf.moonrise.patches.collisions.ExplosionBlockCache[] blockCache, final ca.spottedleaf.moonrise.patches.collisions.ExplosionBlockCache initialCache) {
 +        // Sakura end - optimise paper explosions
          for (int ray = 0, len = CACHED_RAYS.length; ray < len;) {
              ca.spottedleaf.moonrise.patches.collisions.ExplosionBlockCache cachedBlock = initialCache;
@@ -97,7 +97,7 @@ index 798b840af2dc5f58e6df55426a1802d79ff5d6cb..23549ea6ad18812e76f5d889d73cc143
 +        return new AABB((double) i, (double) l, (double) j1, (double) j, (double) i1, (double) k1);
 +    }
 +
-+    protected final void locateAndImpactEntities(final ca.spottedleaf.moonrise.patches.collisions.ExplosionBlockCache[] blockCache) {
++    protected final void locateAndImpactEntities(ca.spottedleaf.moonrise.patches.collisions.ExplosionBlockCache[] blockCache) {
 +        float f2 = this.radius * 2.0F;
          Vec3 vec3d = new Vec3(this.x, this.y, this.z);
 -        Iterator iterator = list.iterator();
diff --git a/patches/server/0047-Reduce-entity-tracker-player-updates.patch b/patches/server/0047-Reduce-entity-tracker-player-updates.patch
index 3d81849..e479209 100644
--- a/patches/server/0047-Reduce-entity-tracker-player-updates.patch
+++ b/patches/server/0047-Reduce-entity-tracker-player-updates.patch
@@ -5,17 +5,16 @@ Subject: [PATCH] Reduce entity tracker player updates
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index ac00b69197964e5c82bc597594d28fcf74f87a02..6855e10e33ec09645dd770f4b9337cc7ca4f4932 100644
+index ac00b69197964e5c82bc597594d28fcf74f87a02..c276781231104b48de7b782b273722c25f463475 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -961,7 +961,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              if (tracker == null) {
                  continue;
              }
--            ((ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerTrackedEntity)tracker).moonrise$tick(nearbyPlayers.getChunk(entity.chunkPosition()));
 +            // Sakura start - reduce entity tracker player updates
 +            if (tracker.shouldUpdatePlayers()) {
-+            ((ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerTrackedEntity) tracker).moonrise$tick(nearbyPlayers.getChunk(entity.chunkPosition()));
+             ((ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerTrackedEntity)tracker).moonrise$tick(nearbyPlayers.getChunk(entity.chunkPosition()));
 +            }
 +            // Sakura end - reduce entity tracker player updates
              tracker.serverEntity.sendChanges();
diff --git a/patches/server/0048-Add-option-for-legacy-lava-block-formation.patch b/patches/server/0048-Add-option-for-legacy-lava-block-formation.patch
index fe0808f..929b4de 100644
--- a/patches/server/0048-Add-option-for-legacy-lava-block-formation.patch
+++ b/patches/server/0048-Add-option-for-legacy-lava-block-formation.patch
@@ -26,7 +26,7 @@ index afd6549f110ce32a1ad382b17f202ab53e7e6496..6640dd9041cc4567e53b8c6d6acc2485
                          // SANITY: In legacy a patch by paper removes the fluid level condition from vanilla.
                          if (physics.afterOrEqual(1_16_0) || physics.isLegacy()
 diff --git a/src/main/java/net/minecraft/world/level/material/LavaFluid.java b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
-index 8de74ad65e9b9019d1b4ffc01c44783c1c769cf1..1c82fd204919c22761bd29c039dd0b1dbc45d3e4 100644
+index 8de74ad65e9b9019d1b4ffc01c44783c1c769cf1..28a968e7738b37a4280d5019b5334e5e0303c5ae 100644
 --- a/src/main/java/net/minecraft/world/level/material/LavaFluid.java
 +++ b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
 @@ -177,7 +177,7 @@ public abstract class LavaFluid extends FlowingFluid {
@@ -34,7 +34,7 @@ index 8de74ad65e9b9019d1b4ffc01c44783c1c769cf1..1c82fd204919c22761bd29c039dd0b1d
          // Sakura start - physics version api
          return state.getHeight(world, pos) >= 0.44444445F && fluid.is(FluidTags.WATER)
 -            && world instanceof Level level && level.localConfig().config(pos).physicsVersion.afterOrEqual(1_13_0);
-+            && world instanceof Level level && !level.sakuraConfig().environment.blockGeneration.legacyBlockFormation && level.localConfig().config(pos).physicsVersion.before(1_13_0); // Sakura - legacy lava block formation
++            && world instanceof Level level && !level.sakuraConfig().environment.blockGeneration.legacyBlockFormation && level.localConfig().config(pos).physicsVersion.afterOrEqual(1_13_0); // Sakura - legacy lava block formation
          // Sakura end - physics version api
      }