Support kill from console

GoJam11 · Apr 25, 2022 · b6fedcf · b6fedcf
1 parent dc6702e
commit b6fedcf
Showing 1 changed file with 26 additions and 15 deletions.
diff --git a/src/main/java/emu/grasscutter/command/commands/KillCharacterCommand.java b/src/main/java/emu/grasscutter/command/commands/KillCharacterCommand.java
@@ -13,30 +13,41 @@
 import java.util.List;
 
 @Command(label = "killcharacter", usage = "killcharacter [playerId]", aliases = {"suicide", "kill"},
-        description = "Directly kill a player's current active character", permission = "player.killcharacter")
+        description = "Kills the players current character", permission = "player.killcharacter")
 public final class KillCharacterCommand implements CommandHandler {
 
     @Override
     public void execute(GenshinPlayer sender, List<String> args) {
-        if (sender == null) {
-            CommandHandler.sendMessage(null, "Run this command in-game.");
-            return; // TODO: kill a player's current active character from console
-        }
-
         int target;
-        if (args.size() == 1) {
-            try {
-                target = Integer.parseInt(args.get(0));
-                if (Grasscutter.getGameServer().getPlayerByUid(target) == null) {
-                    target = sender.getUid();
+        if (sender == null) {
+            // from console
+            if (args.size() == 1) {
+                try {
+                    target = Integer.parseInt(args.get(0));
+                } catch (NumberFormatException e) {
+                    CommandHandler.sendMessage(null, "Invalid player id.");
+                    return;
                 }
-            } catch (NumberFormatException e) {
-                CommandHandler.sendMessage(sender, "Invalid player id.");
+            } else {
+                CommandHandler.sendMessage(null, "Usage: /killcharacter [playerId]");
                 return;
             }
         } else {
-            target = sender.getUid();
+            if (args.size() == 1) {
+                try {
+                    target = Integer.parseInt(args.get(0));
+                    if (Grasscutter.getGameServer().getPlayerByUid(target) == null) {
+                        target = sender.getUid();
+                    }
+                } catch (NumberFormatException e) {
+                    CommandHandler.sendMessage(sender, "Invalid player id.");
+                    return;
+                }
+            } else {
+                target = sender.getUid();
+            }
         }
+
         GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
         if (targetPlayer == null) {
             CommandHandler.sendMessage(sender, "Player not found or offline.");
@@ -52,6 +63,6 @@ public void execute(GenshinPlayer sender, List<String> args) {
         targetPlayer.getScene().removeEntity(entity);
         entity.onDeath(0);
 
-        sender.dropMessage("Killed " + targetPlayer.getNickname() + "'s current active character.");
+        CommandHandler.sendMessage(sender, "Killed " + targetPlayer.getNickname() + " current character.");
     }
 }