From 8e9dabb350626700fb40172b083da852a3966785 Mon Sep 17 00:00:00 2001 From: fuzzbuck <54221024+fuzzbuck@users.noreply.github.com> Date: Mon, 2 Mar 2020 19:37:04 +0100 Subject: [PATCH] Add "pardon" command for votekicks (#1570) * Add "pardon" command Allows players who have been incorrectly votekicked to join again * isn't hasn't * getInfoOptional & space * pardon me no pun intended * Update ServerControl.java --- server/src/mindustry/server/ServerControl.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index a92cbdebec..6ecc42fb05 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -659,6 +659,17 @@ public class ServerControl implements ApplicationListener{ err("That IP/ID is not banned!"); } }); + + handler.register("pardon", "", "Pardons a votekicked player by ID and allows them to join again.", arg -> { + PlayerInfo info = netServer.admins.getInfoOptional(arg[0]); + + if(info != null){ + info.lastKicked = 0; + info("Pardoned player: {0}", info.lastName); + }else{ + err("That ID can't be found."); + } + }); handler.register("admin", " ", "Make an online user admin", arg -> { if(!state.is(State.playing)){