Merge pull request #46 from AJ-Ferguson/master

Fix for block breaking and support for spawn protection

connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java

@@ -32,6 +32,7 @@ import com.flowpowered.math.vector.Vector3i;
 import com.github.steveice10.mc.auth.data.GameProfile;
 import com.github.steveice10.mc.auth.exception.request.RequestException;
 import com.github.steveice10.mc.protocol.MinecraftProtocol;
+import com.github.steveice10.mc.protocol.data.game.world.block.BlockFace;
 import com.github.steveice10.packetlib.Client;
 import com.github.steveice10.packetlib.event.session.ConnectedEvent;
 import com.github.steveice10.packetlib.event.session.DisconnectedEvent;
@@ -64,13 +65,6 @@ import java.util.UUID;
 
 @Getter
 public class GeyserSession implements Player {
-    @Getter
-    @Setter
-    private volatile boolean breaking;
-
-    @Getter
-    @Setter
-    private volatile boolean threadStop;
 
     private final GeyserConnector connector;
     private final BedrockServerSession upstream;
@@ -101,9 +95,10 @@ public class GeyserSession implements Player {
     private boolean spawned;
     private boolean closed;
 
-    @Getter
     @Setter
-    private Thread breakThread;
+    private Vector3i blockDiggingPos = Vector3i.ZERO;
+    @Setter
+    private BlockFace blockDiggingFace = BlockFace.DOWN;
 
     public GeyserSession(GeyserConnector connector, BedrockServerSession bedrockServerSession) {
         this.connector = connector;

connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java

@@ -28,6 +28,7 @@ package org.geysermc.connector.network.translators;
 import com.github.steveice10.mc.protocol.data.game.window.WindowType;
 import com.github.steveice10.mc.protocol.packet.ingame.server.*;
 import com.github.steveice10.mc.protocol.packet.ingame.server.entity.*;
+import com.github.steveice10.mc.protocol.packet.ingame.server.entity.player.ServerPlayerActionAckPacket;
 import com.github.steveice10.mc.protocol.packet.ingame.server.entity.player.ServerPlayerHealthPacket;
 import com.github.steveice10.mc.protocol.packet.ingame.server.entity.player.ServerPlayerPositionRotationPacket;
 import com.github.steveice10.mc.protocol.packet.ingame.server.entity.player.ServerPlayerSetExperiencePacket;
@@ -56,6 +57,7 @@ import org.geysermc.connector.network.translators.java.JavaJoinGameTranslator;
 import org.geysermc.connector.network.translators.java.JavaRespawnTranslator;
 import org.geysermc.connector.network.translators.java.JavaTitleTranslator;
 import org.geysermc.connector.network.translators.java.entity.*;
+import org.geysermc.connector.network.translators.java.entity.player.JavaPlayerActionAckTranslator;
 import org.geysermc.connector.network.translators.java.entity.player.JavaPlayerHealthTranslator;
 import org.geysermc.connector.network.translators.java.entity.player.JavaPlayerPositionRotationTranslator;
 import org.geysermc.connector.network.translators.java.entity.player.JavaPlayerSetExperienceTranslator;
@@ -131,6 +133,7 @@ public class TranslatorsInit {
         Registry.registerJava(ServerPlayerPositionRotationPacket.class, new JavaPlayerPositionRotationTranslator());
         Registry.registerJava(ServerPlayerSetExperiencePacket.class, new JavaPlayerSetExperienceTranslator());
         Registry.registerJava(ServerPlayerHealthPacket.class, new JavaPlayerHealthTranslator());
+        Registry.registerJava(ServerPlayerActionAckPacket.class, new JavaPlayerActionAckTranslator());
 
         Registry.registerJava(ServerNotifyClientPacket.class, new JavaNotifyClientTranslator());
         Registry.registerJava(ServerChunkDataPacket.class, new JavaChunkDataTranslator());

connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockActionTranslator.java

@@ -80,69 +80,36 @@ public class BedrockActionTranslator extends PacketTranslator<PlayerActionPacket
                 ClientPlayerActionPacket dropItemPacket = new ClientPlayerActionPacket(PlayerAction.DROP_ITEM, position, BlockFace.values()[packet.getFace()]);
                 session.getDownstream().getSession().send(dropItemPacket);
                 break;
-
             case STOP_SLEEP:
                 ClientPlayerStatePacket stopSleepingPacket = new ClientPlayerStatePacket((int) session.getPlayerEntity().getGeyserId(), PlayerState.LEAVE_BED);
                 session.getDownstream().getSession().send(stopSleepingPacket);
                 break;
-
             case BLOCK_INTERACT:
                 ClientPlayerPlaceBlockPacket blockPacket = new ClientPlayerPlaceBlockPacket(position,
                         BlockFace.values()[packet.getFace()],
                         Hand.MAIN_HAND, 0, 0, 0, false);
-
                 session.getDownstream().getSession().send(blockPacket);
                 break;
-
             case START_BREAK:
-                System.out.println("a");
+                ClientPlayerActionPacket startBreakingPacket = new ClientPlayerActionPacket(PlayerAction.START_DIGGING, new Position(packet.getBlockPosition().getX(),
-                ClientPlayerActionPacket actionPacket = new ClientPlayerActionPacket(PlayerAction.START_DIGGING, position, BlockFace.values()[1]);
+                        packet.getBlockPosition().getY(), packet.getBlockPosition().getZ()), BlockFace.values()[packet.getFace()]);
-                session.getDownstream().getSession().send(actionPacket);
+                session.setBlockDiggingPos(packet.getBlockPosition());
-
+                session.setBlockDiggingFace(BlockFace.values()[packet.getFace()]);
-                session.setThreadStop(false);
+                session.getDownstream().getSession().send(startBreakingPacket);
-                session.setBreaking(true);
-
-                Thread thread = new Thread() {
-                    @Override
-                    public void run() {
-                        while (session.isThreadStop()) {
-                            try {
-                                Thread.sleep(1);
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            }
-
-                            if(session.isBreaking()) {
-                                session.setBreaking(false);
-                            } else {
-                                ClientPlayerActionPacket actionPacket = new ClientPlayerActionPacket(PlayerAction.CANCEL_DIGGING, position, BlockFace.values()[1]);
-                                session.getDownstream().getSession().send(actionPacket);
-                            }
-                        }
-                    }
-                };
-
-                session.setBreakThread(thread);
-
-                thread.start();
-
-            case STOP_BREAK:
-                System.out.println("b");
-                session.getBreakThread().stop();
                 break;
-
-            case ABORT_BREAK:
-                System.out.println("c");
-                //ClientPlayerActionPacket actionPacket3 = new ClientPlayerActionPacket(PlayerAction.CANCEL_DIGGING, position, BlockFace.values()[1]);
-
-                //session.getDownstream().getSession().send(actionPacket3);
-                break;
-
             case CONTINUE_BREAK:
-                System.out.println("d");
+                session.setBlockDiggingFace(BlockFace.values()[packet.getFace()]);
-
+                break;
-                session.setBreaking(true);
+            case ABORT_BREAK:
-
+                ClientPlayerActionPacket abortBreakingPacket = new ClientPlayerActionPacket(PlayerAction.CANCEL_DIGGING, new Position(packet.getBlockPosition().getX(),
+                        packet.getBlockPosition().getY(), packet.getBlockPosition().getZ()), BlockFace.DOWN);
+                session.getDownstream().getSession().send(abortBreakingPacket);
+                break;
+            case STOP_BREAK:
+                Vector3i pos = session.getBlockDiggingPos();
+                ClientPlayerActionPacket stopBreakingPacket = new ClientPlayerActionPacket(PlayerAction.FINISH_DIGGING, new Position(pos.getX(),
+                        pos.getY(), pos.getZ()), session.getBlockDiggingFace());
+                session.getDownstream().getSession().send(stopBreakingPacket);
                 break;
         }
     }

connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerActionAckTranslator.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2019 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.connector.network.translators.java.entity.player;
+
+import com.flowpowered.math.vector.Vector3i;
+import com.github.steveice10.mc.protocol.packet.ingame.server.entity.player.ServerPlayerActionAckPacket;
+import com.nukkitx.protocol.bedrock.packet.UpdateBlockPacket;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.PacketTranslator;
+import org.geysermc.connector.network.translators.TranslatorsInit;
+import org.geysermc.connector.network.translators.item.BedrockItem;
+import org.geysermc.connector.world.GlobalBlockPalette;
+
+public class JavaPlayerActionAckTranslator extends PacketTranslator<ServerPlayerActionAckPacket> {
+
+    @Override
+    public void translate(ServerPlayerActionAckPacket packet, GeyserSession session) {
+        switch (packet.getAction()) {
+            case FINISH_DIGGING:
+                UpdateBlockPacket updateBlockPacket = new UpdateBlockPacket();
+                BedrockItem bedrockItem = TranslatorsInit.getBlockTranslator().getBedrockBlock(packet.getNewState());
+                updateBlockPacket.setBlockPosition(Vector3i.from(packet.getPosition().getX(), packet.getPosition().getY(), packet.getPosition().getZ()));
+                updateBlockPacket.setRuntimeId(GlobalBlockPalette.getOrCreateRuntimeId(bedrockItem.hashCode()));
+                session.getUpstream().sendPacket(updateBlockPacket);
+                break;
+        }
+    }
+}