Merge branch 'master' into 1.15

src/main/java/carpet/settings/CarpetSettings.java

@@ -174,8 +174,8 @@ public class CarpetSettings
 
     @Rule(
             desc = "Enables /log command to monitor events in the game via chat and overlays",
-            category = COMMAND,
-            validate = Validator.WIP.class
+            category = COMMAND//,
+            //validate = Validator.WIP.class
     )
     public static boolean commandLog = true;
 

src/main/java/carpet/settings/SettingsManager.java

@@ -74,6 +74,12 @@ public class SettingsManager
         notifyPlayersCommandsChanged();
     }
 
+    public void detachServer()
+    {
+        for (ParsedRule<?> rule : rules.values()) rule.resetToDefault(server.getCommandSource());
+        server = null;
+    }
+
     public void parseSettingsClass(Class settingsClass)
     {
         for (Field f : settingsClass.getDeclaredFields())