From f65662efafd3a86e9f73d681429334d2dac58cb1 Mon Sep 17 00:00:00 2001
From: Kam <KamronVaswani@gmail.com>
Date: Thu, 6 Nov 2025 02:34:47 -0500
Subject: [PATCH] Preserve airborne momentum when mounts dismount riders

---
 .../npcs/entity/EntityNPCInterface.java       | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
index 4f0abbe61..96310a01e 100644
--- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
+++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
@@ -2270,12 +2270,26 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
     }
 
     private void stabilizeDismountedRider(Entity rider) {
-        rider.motionX = 0.0D;
-        rider.motionY = 0.0D;
-        rider.motionZ = 0.0D;
-        rider.fallDistance = 0.0F;
+        boolean wasOnGround = rider.onGround;
+        double previousMotionX = rider.motionX;
+        double previousMotionY = rider.motionY;
+        double previousMotionZ = rider.motionZ;
+        float previousFall = rider.fallDistance;
+
+        if (wasOnGround) {
+            rider.motionX = 0.0D;
+            rider.motionY = 0.0D;
+            rider.motionZ = 0.0D;
+            rider.fallDistance = 0.0F;
+            rider.onGround = true;
+        } else {
+            rider.motionX = previousMotionX;
+            rider.motionY = previousMotionY;
+            rider.motionZ = previousMotionZ;
+            rider.fallDistance = previousFall;
+        }
+
         rider.velocityChanged = true;
-        rider.onGround = true;
     }
 
     private void haltMountedMotion() {