Fixed an issue with kicking players

(Still broken but now it actually disconnects the player)
kaminodao · Apr 19, 2022 · d2ef8a4 · d2ef8a4
1 parent ca4cb2b
commit d2ef8a4
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/main/java/emu/grasscutter/commands/ServerCommands.java b/src/main/java/emu/grasscutter/commands/ServerCommands.java
@@ -40,16 +40,26 @@ public void execute(GenshinPlayer player, List<String> args) {
     public static class KickCommand implements CommandHandler {
         @Override
         public void execute(List<String> args) {
+            this.execute(null, args);
+        }
+
+        @Override
+        public void execute(GenshinPlayer player, List<String> args) {
             int target = Integer.parseInt(args.get(0));
             String message = String.join(" ", args.subList(1, args.size()));
 
-            GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerById(target);
+            GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
             if(targetPlayer == null) {
-                CommandHandler.sendMessage(null, "Player not found."); return;
+                CommandHandler.sendMessage(player, "Player not found.");
+                return;
+            }
+            if(player != null) {
+                CommandHandler.sendMessage(null, String.format("Player [%s:%s] has kicked player [%s:%s]", player.getAccount().getPlayerId(), player.getAccount().getUsername(), target, targetPlayer.getAccount().getUsername()));
             }
 
-            targetPlayer.sendPacket(new PacketSceneKickPlayerRsp(targetPlayer.getId()));
-            //targetPlayer.getSession().close();
+                CommandHandler.sendMessage(player, String.format("Kicking player [%s:%s]", target, targetPlayer.getAccount().getUsername()));
+
+            targetPlayer.getSession().close();
         }
     }