From dec62e94e2dadd430a611d74424e4473b30be26a Mon Sep 17 00:00:00 2001
From: chris <github@onechris.mozmail.com>
Date: Sun, 8 Oct 2023 00:31:23 +0200
Subject: [PATCH] Fix: Implement 1.20.30 START_FLYING and STOP_FLYING cases
 (#4198)

---
 .../BedrockRequestAbilityTranslator.java      |  1 +
 .../player/BedrockActionTranslator.java       | 34 +++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockRequestAbilityTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockRequestAbilityTranslator.java
index 00cd5e5fd..f31fdba80 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockRequestAbilityTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockRequestAbilityTranslator.java
@@ -42,6 +42,7 @@ public class BedrockRequestAbilityTranslator extends PacketTranslator<RequestAbi
 
     @Override
     public void translate(GeyserSession session, RequestAbilityPacket packet) {
+        // TODO: Since 1.20.30, this was replaced by a START_FLYING and STOP_FLYING case in BedrockActionTranslator
         if (packet.getAbility() == Ability.FLYING) {
             boolean isFlying = packet.isBoolValue();
             if (!isFlying && session.getGameMode() == GameMode.SPECTATOR) {
diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockActionTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockActionTranslator.java
index 1917ad6d1..826a76575 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockActionTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockActionTranslator.java
@@ -297,6 +297,40 @@ public class BedrockActionTranslator extends PacketTranslator<PlayerActionPacket
                     session.sendUpstreamPacket(animatePacket);
                 }
                 break;
+            case START_FLYING: // Since 1.20.30
+                 if (session.isCanFly()) {
+                     if (session.getGameMode() == GameMode.SPECTATOR) {
+                         // should already be flying
+                         session.sendAdventureSettings();
+                         break;
+                     }
+
+                     if (session.getPlayerEntity().getFlag(EntityFlag.SWIMMING) && session.getCollisionManager().isPlayerInWater()) {
+                         // As of 1.18.1, Java Edition cannot fly while in water, but it can fly while crawling
+                         // If this isn't present, swimming on a 1.13.2 server and then attempting to fly will put you into a flying/swimming state that is invalid on JE
+                         session.sendAdventureSettings();
+                         break;
+                     }
+
+                     session.setFlying(true);
+                     session.sendDownstreamPacket(new ServerboundPlayerAbilitiesPacket(true));
+                 } else {
+                     // update whether we can fly
+                     session.sendAdventureSettings();
+                     // stop flying
+                     PlayerActionPacket stopFlyingPacket = new PlayerActionPacket();
+                     stopFlyingPacket.setRuntimeEntityId(session.getPlayerEntity().getGeyserId());
+                     stopFlyingPacket.setAction(PlayerActionType.STOP_FLYING);
+                     stopFlyingPacket.setBlockPosition(Vector3i.ZERO);
+                     stopFlyingPacket.setResultPosition(Vector3i.ZERO);
+                     stopFlyingPacket.setFace(0);
+                     session.sendUpstreamPacket(stopFlyingPacket);
+                 }
+                 break;
+            case STOP_FLYING:
+                session.setFlying(false);
+                session.sendDownstreamPacket(new ServerboundPlayerAbilitiesPacket(false));
+                break;
         }
     }
 }