Merge remote-tracking branch 'origin/master'

2022-06-13 20:48:15 -04:00
parent 7b1d36a40a 0d6303c841
commit 1be8f11ec8
1 changed files with 1 additions and 1 deletions
--- a/server/src/mindustry/server/ServerControl.java
+++ b/server/src/mindustry/server/ServerControl.java
@@ -815,7 +815,7 @@ public class ServerControl implements ApplicationListener{

            if(target != null){
                if(add){
-                    netServer.admins.adminPlayer(target.id, target.adminUsid);
+                    netServer.admins.adminPlayer(target.id, playert == null ? target.adminUsid : playert.usid());
                }else{
                    netServer.admins.unAdminPlayer(target.id);
                }