2 files changed, 15 insertions, 23 deletions

diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BCPlayer.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BCPlayer.java
index b8227ee..2b6f537 100644
--- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BCPlayer.java
+++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BCPlayer.java
@@ -132,13 +132,13 @@ public class BCPlayer {
 
         TextPacket text = new TextPacket();
         text.setType(TextPacket.Type.TIP);
-        text.setMessage("==!!== Move around to re-trigger the popup ==!!==");
+        text.setMessage("==!!== Crouch or punch to re-trigger the popup ==!!==");
         text.setXuid(uuid);
         session.sendPacket(text);
 
         TextPacket text2 = new TextPacket();
         text2.setType(TextPacket.Type.RAW);
-        text2.setMessage("\n\n\n\n\n\n\n\n\n\n\n\n\n\n==!!== Move around to re-trigger the popup ==!!==\n\n\n\n\n\n\n\n\n\n\n");
+        text2.setMessage("\n\n\n\n\n\n\n\n\n\n\n\n\n\n==!!== Crouch or punch to re-trigger the popup ==!!==\n\n\n\n\n\n\n\n\n\n\n");
         text2.setXuid(uuid);
         session.sendPacket(text2);
     }
@@ -163,22 +163,7 @@ public class BCPlayer {
 
         if(canMovementOpen()) {
 
-            ModalFormRequestPacket form;
-
-            switch (getCurrentForm()) {
-                case UIForms.MAIN:
-                    form = UIForms.createMain(getServerList(), session);
-                    break;
-                case UIForms.DIRECT_CONNECT:
-                    form = UIForms.createDirectConnect();
-                    break;
-                case UIForms.REMOVE_SERVER:
-                    form = UIForms.createRemoveServer(getServerList());
-                    break;
-                default:
-                    form = UIForms.createMain(getServerList(), session);
-                    break;
-            }
+            ModalFormRequestPacket form = getForm(getCurrentForm());
 
             session.sendPacketImmediately(form);
 
@@ -187,6 +172,14 @@ public class BCPlayer {
     }
 
     public void openForm(int formId) {
+        ModalFormRequestPacket form = getForm(formId);
+
+        session.sendPacketImmediately(form);
+
+        setCurrentForm(formId);
+    }
+
+    private ModalFormRequestPacket getForm(int formId) {
         ModalFormRequestPacket form;
 
         switch (formId) {
@@ -216,9 +209,7 @@ public class BCPlayer {
                 break;
         }
 
-        session.sendPacketImmediately(form);
-
-        setCurrentForm(formId);
+        return form;
     }
 
     public void createError(String text) {
diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/listeners/PacketHandler.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/listeners/PacketHandler.java
index 66c3cd4..66828c3 100644
--- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/listeners/PacketHandler.java
+++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/listeners/PacketHandler.java
@@ -77,9 +77,10 @@ public class PacketHandler implements BedrockPacketHandler {
         player.movementOpen();
         return false;
     }
+
     @Override
-    public boolean handle(MovePlayerPacket packet) {
-        if(packet.getMode() == MovePlayerPacket.Mode.NORMAL || packet.getMode() == MovePlayerPacket.Mode.HEAD_ROTATION)
+    public boolean handle(AnimatePacket packet) {
+        if(packet.getAction() == AnimatePacket.Action.SWING_ARM)
             player.movementOpen();
         return false;
     }