From 77256517269fc9dc3b16b3261c70f25d1d859bf1 Mon Sep 17 00:00:00 2001
From: Roman Alexander <romanalexander@users.noreply.github.com>
Date: Sun, 30 Jul 2023 16:48:29 -0400
Subject: [PATCH] Fix double sending ServerboundPlayerActionPacket in creative
 (both of which Spigot interprets as a BlockBreakEvent) (Fixes #4021) (#3996)

---
 .../player/BedrockActionTranslator.java       | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

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 932fcb96f..f0b2a3526 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
@@ -144,19 +144,22 @@ public class BedrockActionTranslator extends PacketTranslator<PlayerActionPacket
                 ServerboundPlayerCommandPacket stopSleepingPacket = new ServerboundPlayerCommandPacket(entity.getEntityId(), PlayerState.LEAVE_BED);
                 session.sendDownstreamPacket(stopSleepingPacket);
                 break;
-            case START_BREAK:
+            case START_BREAK: {
                 // Start the block breaking animation
-                if (session.getGameMode() != GameMode.CREATIVE) {
-                    int blockState = session.getGeyser().getWorldManager().getBlockAt(session, vector);
-                    LevelEventPacket startBreak = new LevelEventPacket();
-                    startBreak.setType(LevelEvent.BLOCK_START_BREAK);
-                    startBreak.setPosition(vector.toFloat());
-                    double breakTime = BlockUtils.getSessionBreakTime(session, BlockRegistries.JAVA_BLOCKS.get(blockState)) * 20;
-                    startBreak.setData((int) (65535 / breakTime));
-                    session.setBreakingBlock(blockState);
-                    session.sendUpstreamPacket(startBreak);
+                // Ignore START_BREAK when the player is CREATIVE to avoid Spigot receiving 2 packets it interpets as block breaking. https://github.com/GeyserMC/Geyser/issues/4021 
+                if (session.getGameMode() == GameMode.CREATIVE) { 
+                    break;
                 }
 
+                int blockState = session.getGeyser().getWorldManager().getBlockAt(session, vector);
+                LevelEventPacket startBreak = new LevelEventPacket();
+                startBreak.setType(LevelEvent.BLOCK_START_BREAK);
+                startBreak.setPosition(vector.toFloat());
+                double breakTime = BlockUtils.getSessionBreakTime(session, BlockRegistries.JAVA_BLOCKS.get(blockState)) * 20;
+                startBreak.setData((int) (65535 / breakTime));
+                session.setBreakingBlock(blockState);
+                session.sendUpstreamPacket(startBreak);
+
                 // Account for fire - the client likes to hit the block behind.
                 Vector3i fireBlockPos = BlockUtils.getBlockPosition(vector, packet.getFace());
                 int blockUp = session.getGeyser().getWorldManager().getBlockAt(session, fireBlockPos);
@@ -165,15 +168,13 @@ public class BedrockActionTranslator extends PacketTranslator<PlayerActionPacket
                     ServerboundPlayerActionPacket startBreakingPacket = new ServerboundPlayerActionPacket(PlayerAction.START_DIGGING, fireBlockPos,
                             Direction.VALUES[packet.getFace()], session.getWorldCache().nextPredictionSequence());
                     session.sendDownstreamPacket(startBreakingPacket);
-                    if (session.getGameMode() == GameMode.CREATIVE) {
-                        break;
-                    }
                 }
 
                 ServerboundPlayerActionPacket startBreakingPacket = new ServerboundPlayerActionPacket(PlayerAction.START_DIGGING,
                         vector, Direction.VALUES[packet.getFace()], session.getWorldCache().nextPredictionSequence());
                 session.sendDownstreamPacket(startBreakingPacket);
                 break;
+            }
             case CONTINUE_BREAK:
                 if (session.getGameMode() == GameMode.CREATIVE) {
                     break;