Close the current inventory before sending form, kick players sending invalid block break actions

Author: onebeastchris

core/src/main/java/org/geysermc/geyser/session/GeyserSession.java

@@ -1681,6 +1681,10 @@ public InetSocketAddress getSocketAddress() {
     public boolean sendForm(@NonNull Form form) {
         // First close any dialogs that are open. This won't execute the dialog's closing action.
         dialogManager.close();
+        // Also close current inventories, otherwise the form will not show
+        if (getOpenInventory() != null) {
+            InventoryUtils.closeInventory(this, getOpenInventory().getJavaId(), true);
+        }
         return doSendForm(form);
     }
 
@@ -2278,11 +2282,17 @@ public UUID javaUuid() {
 
     @Override
     public @NonNull String version() {
+        if (clientData == null) {
+            return "unknown";
+        }
         return clientData.getGameVersion();
     }
 
     @Override
     public @NonNull BedrockPlatform platform() {
+        if (clientData == null) {
+            return BedrockPlatform.UNKNOWN;
+        }
         return BedrockPlatform.values()[clientData.getDeviceOs().ordinal()]; //todo
     }
 
@@ -2429,4 +2439,8 @@ private void softEnumPacket(String name, SoftEnumUpdateType type, String enums)
         packet.setSoftEnum(new CommandEnumData(name, Collections.singletonMap(enums, Collections.emptySet()), true));
         sendUpstreamPacket(packet);
     }
+
+    public String getDebugInfo() {
+        return "Username: %s, DeviceOs: %s, Version: %s".formatted(bedrockUsername(), platform(), version());
+    }
 }

core/src/main/java/org/geysermc/geyser/session/cache/BlockBreakHandler.java

@@ -256,7 +256,10 @@ protected void handleBlockBreakActions(PlayerAuthInputPacket packet) {
                     handleAbortBreaking(position);
                 }
                 default -> {
-                    throw new IllegalStateException("Unknown block break action: " + actionData.getAction());
+                    GeyserImpl.getInstance().getLogger().warning("Unknown block break action (%s) received! (origin: %s)!"
+                        .formatted(actionData.getAction(), session.getDebugInfo()));
+                    GeyserImpl.getInstance().getLogger().debug("Odd packet: " + packet);
+                    session.disconnect("Invalid block breaking action received!");
                 }
             }
         }