From 8c8782c65bc1812a3c3b8793af4d77a5f9c3e87b Mon Sep 17 00:00:00 2001
From: oryxel <gamingnoob681@gmail.com>
Date: Fri, 11 Jul 2025 06:59:09 +0700
Subject: [PATCH] Improve motion translation from explosions (#5659)

---
 .../bedrock/entity/player/input/BedrockMovePlayer.java    | 1 +
 .../protocol/java/level/JavaExplodeTranslator.java        | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/input/BedrockMovePlayer.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/input/BedrockMovePlayer.java
index 3a2f36d5f..ed0738bf1 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/input/BedrockMovePlayer.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/input/BedrockMovePlayer.java
@@ -108,6 +108,7 @@ final class BedrockMovePlayer {
         }
 
         entity.setLastTickEndVelocity(packet.getDelta());
+        entity.setMotion(packet.getDelta());
 
         // This takes into account no movement sent from the client, but the player is trying to move anyway.
         // (Press into a wall in a corner - you're trying to move but nothing actually happens)
diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaExplodeTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaExplodeTranslator.java
index 76ba803e1..816842eba 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaExplodeTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaExplodeTranslator.java
@@ -31,6 +31,7 @@ import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.cloudburstmc.protocol.bedrock.data.LevelEvent;
 import org.cloudburstmc.protocol.bedrock.packet.LevelEventGenericPacket;
 import org.cloudburstmc.protocol.bedrock.packet.SetEntityMotionPacket;
+import org.geysermc.geyser.entity.type.player.SessionPlayerEntity;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.translator.protocol.PacketTranslator;
 import org.geysermc.geyser.translator.protocol.Translator;
@@ -68,9 +69,12 @@ public class JavaExplodeTranslator extends PacketTranslator<ClientboundExplodePa
         SoundUtils.playSound(session, packet.getExplosionSound(), vector, 4.0f, pitch);
 
         if (packet.getPlayerKnockback() != null) {
+            SessionPlayerEntity entity = session.getPlayerEntity();
+            entity.setMotion(entity.getMotion().add(packet.getPlayerKnockback().toFloat()));
+
             SetEntityMotionPacket motionPacket = new SetEntityMotionPacket();
-            motionPacket.setRuntimeEntityId(session.getPlayerEntity().getGeyserId());
-            motionPacket.setMotion(packet.getPlayerKnockback().toFloat());
+            motionPacket.setRuntimeEntityId(entity.getGeyserId());
+            motionPacket.setMotion(entity.getMotion());
             session.sendUpstreamPacket(motionPacket);
         }
     }