Fix fire not extinguishing on server side when on bedrock

Fixes GeyserMC#875 Fixes GeyserMC#906
bundabrg · Aug 8, 2020 · 3ef7e30 · 3ef7e30
1 parent 04cf8b2
commit 3ef7e30
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/...geysermc/connector/network/translators/bedrock/entity/player/BedrockActionTranslator.java b/...geysermc/connector/network/translators/bedrock/entity/player/BedrockActionTranslator.java
@@ -119,6 +119,18 @@ public void translate(PlayerActionPacket packet, GeyserSession session) {
                 // Handled in BedrockInventoryTransactionTranslator
                 break;
             case START_BREAK:
+                if (session.getConnector().getConfig().isCacheChunks()) {
+                    if (packet.getFace() == BlockFace.UP.ordinal()) {
+                        int blockUp = session.getConnector().getWorldManager().getBlockAt(session, packet.getBlockPosition().add(0, 1, 0));
+                        String identifier = BlockTranslator.getJavaIdBlockMap().inverse().get(blockUp);
+                        if (identifier.startsWith("minecraft:fire") || identifier.startsWith("minecraft:soul_fire")) {
+                            ClientPlayerActionPacket startBreakingPacket = new ClientPlayerActionPacket(PlayerAction.START_DIGGING, new Position(packet.getBlockPosition().getX(),
+                                    packet.getBlockPosition().getY() + 1, packet.getBlockPosition().getZ()), BlockFace.values()[packet.getFace()]);
+                            session.sendDownstreamPacket(startBreakingPacket);
+                            break;
+                        }
+                    }
+                }
                 ClientPlayerActionPacket startBreakingPacket = new ClientPlayerActionPacket(PlayerAction.START_DIGGING, new Position(packet.getBlockPosition().getX(),
                         packet.getBlockPosition().getY(), packet.getBlockPosition().getZ()), BlockFace.values()[packet.getFace()]);
                 session.sendDownstreamPacket(startBreakingPacket);