Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-23 22:54:29 +00:00
Code Issues Projects Releases Wiki Activity

Support kill from console

Browse Source
This commit is contained in:
xtaodada 2022-04-25 21:56:12 +08:00 committed by Melledy
parent 76e2fa59d8
commit dbb7350f6f
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/emu/grasscutter/command/commands/KillCharacterCommand.java
View File

@ -13,30 +13,41 @@ import emu.grasscutter.server.packet.send.PacketLifeStateChangeNotify;
import java.util.List; import java.util.List;
@Command(label = "killcharacter", usage = "killcharacter [playerId]", aliases = {"suicide", "kill"}, @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 { public final class KillCharacterCommand implements CommandHandler {
@Override @Override
public void execute(GenshinPlayer sender, List<String> args) { 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; int target;
if (args.size() == 1) { if (sender == null) {
try { // from console
target = Integer.parseInt(args.get(0)); if (args.size() == 1) {
if (Grasscutter.getGameServer().getPlayerByUid(target) == null) { try {
target = sender.getUid(); target = Integer.parseInt(args.get(0));
} catch (NumberFormatException e) {
CommandHandler.sendMessage(null, "Invalid player id.");
return;
} }
} catch (NumberFormatException e) { } else {
CommandHandler.sendMessage(sender, "Invalid player id."); CommandHandler.sendMessage(null, "Usage: /killcharacter [playerId]");
return; return;
} }
} else { } 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); GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
if (targetPlayer == null) { if (targetPlayer == null) {
CommandHandler.sendMessage(sender, "Player not found or offline."); CommandHandler.sendMessage(sender, "Player not found or offline.");
@ -52,6 +63,6 @@ public final class KillCharacterCommand implements CommandHandler {
targetPlayer.getScene().removeEntity(entity); targetPlayer.getScene().removeEntity(entity);
entity.onDeath(0); entity.onDeath(0);
sender.dropMessage("Killed " + targetPlayer.getNickname() + "'s current active character."); CommandHandler.sendMessage(sender, "Killed " + targetPlayer.getNickname() + " current character.");
} }
} }