Skip to content
Snippets Groups Projects
Commit f54cfc6c authored by Benjamin Elsdon's avatar Benjamin Elsdon
Browse files

Fixed an issue with kicking players

(Still broken but now it actually disconnects the player)
parent 058d3222
No related merge requests found
...@@ -40,16 +40,26 @@ public final class ServerCommands { ...@@ -40,16 +40,26 @@ public final class ServerCommands {
public static class KickCommand implements CommandHandler { public static class KickCommand implements CommandHandler {
@Override @Override
public void execute(List<String> args) { 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)); int target = Integer.parseInt(args.get(0));
String message = String.join(" ", args.subList(1, args.size())); String message = String.join(" ", args.subList(1, args.size()));
GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerById(target); GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
if(targetPlayer == null) { 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())); CommandHandler.sendMessage(player, String.format("Kicking player [%s:%s]", target, targetPlayer.getAccount().getUsername()));
//targetPlayer.getSession().close();
targetPlayer.getSession().close();
} }
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment