Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Conflicts: core/src/mindustry/ai/BlockIndexer.java gradle.properties
2021-12-07 14:09:03 -05:00
parent 600954bf4b 76af0228c1
commit f5e9df1265
8 changed files with 49 additions and 11 deletions
--- a/core/src/mindustry/net/Administration.java
+++ b/core/src/mindustry/net/Administration.java
@@ -302,11 +302,13 @@ public class Administration{
    public boolean adminPlayer(String id, String usid){
        PlayerInfo info = getCreateInfo(id);

+        var wasAdmin = info.admin;
+
        info.adminUsid = usid;
        info.admin = true;
        save();

-        return true;
+        return wasAdmin;
    }

    /**