diff --git a/leaves-server/minecraft-patches/features/0007-Leaves-Fakeplayer.patch b/leaves-server/minecraft-patches/features/0007-Leaves-Fakeplayer.patch
index b028b1af..0b7fa05d 100644
--- a/leaves-server/minecraft-patches/features/0007-Leaves-Fakeplayer.patch
+++ b/leaves-server/minecraft-patches/features/0007-Leaves-Fakeplayer.patch
@@ -326,9 +326,18 @@ index f9e7532f86122a379692561a639a209a126e8bba..2412f46837e967694222730e68e7d25a
  
          for (WaypointTransmitter waypointTransmitter : this.waypoints) {
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index d0b30657d7f1caf49d2b75802c4cad192a16c71d..b0742fa9b10563c5d9e769f9bcc0e7532f04ac1e 100644
+index d0b30657d7f1caf49d2b75802c4cad192a16c71d..9c2bb4eec422f09bef905ca1a181153ce424a9ba 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
+@@ -1173,7 +1173,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+ 
+             BlockPos onPosLegacy = this.getOnPosLegacy();
+             BlockState blockState = this.level().getBlockState(onPosLegacy);
+-            if (this.isLocalInstanceAuthoritative()) {
++            if (this.isLocalInstanceAuthoritative() || this instanceof org.leavesmc.leaves.bot.ServerBot) {  // Leaves - ServerBot needs check fall damage
+                 this.checkFallDamage(vec3.y, this.onGround(), blockState, onPosLegacy);
+             }
+ 
 @@ -1487,7 +1487,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
@@ -338,14 +347,6 @@ index d0b30657d7f1caf49d2b75802c4cad192a16c71d..b0742fa9b10563c5d9e769f9bcc0e753
          final boolean xZero = movement.x == 0.0;
          final boolean yZero = movement.y == 0.0;
          final boolean zZero = movement.z == 0.0;
-@@ -4578,6 +4578,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-     }
- 
-     public final boolean isLocalInstanceAuthoritative() {
-+        if (this instanceof org.leavesmc.leaves.bot.ServerBot) return true; // Leaves - ServerBot is always authoritative
-         return this.level.isClientSide() ? this.isLocalClientAuthoritative() : !this.isClientAuthoritative();
-     }
- 
 diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
 index 20687b632f2cc3f25c8f04e34cc1f6f1d0abf741..0b958bda5e3b9b203ab4e7f233ca459a69288522 100644
 --- a/net/minecraft/world/entity/player/Player.java
diff --git a/leaves-server/minecraft-patches/features/0097-Fix-falling-block-s-block-location.patch b/leaves-server/minecraft-patches/features/0097-Fix-falling-block-s-block-location.patch
index d529f298..507c0d9d 100644
--- a/leaves-server/minecraft-patches/features/0097-Fix-falling-block-s-block-location.patch
+++ b/leaves-server/minecraft-patches/features/0097-Fix-falling-block-s-block-location.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix falling block's block location
 
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 21fa81a56522140692af87fe883c05e7bdc10d96..e2b4e720fc9f0e6a6cb29f15d72964c947896a86 100644
+index b3897f7991d47c0373bb0a06ddec257d931ba709..81a6d062c581eeb1d2d0f5807567c50036477ab1 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -5022,6 +5022,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -5021,6 +5021,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              int floor = Mth.floor(x);
              int floor1 = Mth.floor(y);
              int floor2 = Mth.floor(z);
diff --git a/leaves-server/minecraft-patches/features/0129-Vanilla-Fluid-Pushing.patch b/leaves-server/minecraft-patches/features/0129-Vanilla-Fluid-Pushing.patch
index 350fd335..7385669e 100644
--- a/leaves-server/minecraft-patches/features/0129-Vanilla-Fluid-Pushing.patch
+++ b/leaves-server/minecraft-patches/features/0129-Vanilla-Fluid-Pushing.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Vanilla Fluid Pushing
 
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 2ae600340e83efde53d046015ee8ade463138d28..e36325d0d1887608385e2519a00ae52d5aecd158 100644
+index 880910995ae2f69f93c15d7875cd0bc5e365430b..fb5e360257a66c3d8532abbca75a780689cfde0d 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -4731,8 +4731,82 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4730,8 +4730,82 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return Mth.lerp(partialTick, this.yRotO, this.yRot);
      }