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

2021-12-21 10:39:49 -05:00
parent fb09d6bca0 2dfa238ff3
commit 45b81fae37
12 changed files with 52 additions and 18 deletions
@@ -576,7 +576,9 @@ public class ServerControl implements ApplicationListener{
                if(arg.length == 1){
                    info("'@' is currently @.", c.name(), c.get());
                }else{
-                    if(c.isBool()){
+                    if (arg[1].equals("default")){
+                        c.set(c.defaultValue);
+                    }else if(c.isBool()){
                        c.set(arg[1].equals("on") || arg[1].equals("true"));
                    }else if(c.isNum()){
                        try{