diff --git a/patches/server/0063-Moonrise-Optimise-checkInsideBlocks.patch b/patches/server/0063-Moonrise-Optimise-checkInsideBlocks.patch
index 99c030c1d..636cccf86 100644
--- a/patches/server/0063-Moonrise-Optimise-checkInsideBlocks.patch
+++ b/patches/server/0063-Moonrise-Optimise-checkInsideBlocks.patch
@@ -124,7 +124,7 @@ index 39be345524b621e6ae2eec9af9d46da3291c671b..085925162f5099609c9b82ca0103d8dd
 +                                        return;
 +                                    }
 +
-+                                    blockState.entityInside(world, mutablePos, (Entity) this);
++                                    blockState.entityInside(world, mutablePos, this);
 +                                    this.onInsideBlock(blockState);
 +                                }
 +                            }
@@ -132,6 +132,8 @@ index 39be345524b621e6ae2eec9af9d46da3291c671b..085925162f5099609c9b82ca0103d8dd
 +                    }
 +                }
 +            }
++
++            return;
 +        }
 +        // Moonrise end - Optimise checkInsideBlocks
          AABB axisalignedbb = this.getBoundingBox();
diff --git a/patches/server/0064-Moonrise-Avoid-streams-for-block-retrieval-in-Entity.patch b/patches/server/0064-Moonrise-Avoid-streams-for-block-retrieval-in-Entity.patch
index 2246545ad..b75e58a99 100644
--- a/patches/server/0064-Moonrise-Avoid-streams-for-block-retrieval-in-Entity.patch
+++ b/patches/server/0064-Moonrise-Avoid-streams-for-block-retrieval-in-Entity.patch
@@ -29,20 +29,6 @@ index 085925162f5099609c9b82ca0103d8dd5d2cb22d..1ca8c17df3f0bf6cca8831145c328283
          // Paper end - detailed watchdog information
      }
  
-+    // Leaf start - Optimize check nearby fire or lava on entity move
-+    private boolean nearByBlockStateNoneMatch(java.util.List<BlockState> into, Predicate<BlockState> predicate) {
-+        if (into.isEmpty()) return true;
-+
-+        for (BlockState iblockdata : into) {
-+            if (predicate.test(iblockdata)) {
-+                return false;
-+            }
-+        }
-+
-+        return true;
-+    }
-+    // Leaf end - Optimize check nearby fire or lava on entity move
-+
 +    // Moonrise start - Avoid streams for block retrieval in Entity#move
 +    private boolean noLavaAndFireNearEntityByRange(final AABB boundingBox) {
 +        final int minBlockX = Mth.floor(boundingBox.minX);