Merge pull request #3397 from Multiverse/fix/config-reset

Remove config saving on plugin disable

src/main/java/org/mvplugins/multiverse/core/MultiverseCore.java

@@ -124,7 +124,6 @@ public class MultiverseCore extends MultiverseModule {
     public void onDisable() {
         super.onDisable();
         MultiverseCoreApi.shutdown();
-        saveAllConfigs();
         shutdownDependencyInjection();
         PluginServiceLocatorFactory.get().shutdown();
         Logging.shutdown();
@@ -215,11 +214,11 @@ public class MultiverseCore extends MultiverseModule {
      */
     private Try<Void> saveAllConfigs() {
         return configProvider.get().save()
-                .flatMap(ignore -> worldManagerProvider.get().saveWorldsConfig())
-                .flatMap(ignore ->anchorManagerProvider.get().saveAllAnchors())
-                .onFailure(e -> {
-                    Logging.severe("Failed to save configs, things may not work as expected.");
-                });
+                .andThenTry(() -> worldManagerProvider.get().saveWorldsConfig())
+                .andThenTry(() -> anchorManagerProvider.get().saveAllAnchors())
+                .onFailure(e ->
+                        Logging.severe("Failed to save all configs, things may not work as expected. %s",
+                                e.getLocalizedMessage()));
     }
 
     /**

src/main/java/org/mvplugins/multiverse/core/commands/ConfigCommand.java

@@ -67,12 +67,10 @@ class ConfigCommand extends CoreCommand {
     private void updateConfigValue(MVCommandIssuer issuer, String name, String value) {
         var stringPropertyHandle = config.getStringPropertyHandle();
         stringPropertyHandle.setPropertyString(issuer.getIssuer(), name, value)
-                .onSuccess(ignore -> {
-                    config.save();
-                    issuer.sendMessage(MVCorei18n.CONFIG_SET_SUCCESS,
-                            Replace.NAME.with(name),
-                            Replace.VALUE.with(stringPropertyHandle.getProperty(name).getOrNull()));
-                })
+                .andThenTry(config::save)
+                .onSuccess(ignore -> issuer.sendMessage(MVCorei18n.CONFIG_SET_SUCCESS,
+                        Replace.NAME.with(name),
+                        Replace.VALUE.with(stringPropertyHandle.getProperty(name).getOrNull())))
                 .onFailure(e -> issuer.sendMessage(MVCorei18n.CONFIG_SET_ERROR,
                         Replace.NAME.with(name),
                         Replace.VALUE.with(value),

src/main/java/org/mvplugins/multiverse/core/commands/EntitySpawnConfigCommand.java

@@ -113,11 +113,10 @@ final class EntitySpawnConfigCommand extends CoreCommand {
                 .getSpawnCategoryConfig(spawnCategory)
                 .getStringPropertyHandle()
                 .modifyPropertyString(property, value, action)
+                .andThenTry(worldManager::saveWorldsConfig)
                 .onSuccess(ignore -> issuer.sendInfo("Successfully set " + property + " to " + value
                         + " for " + spawnCategory.name() + " in " + world.getName()))
                 .onFailure(e -> issuer.sendError("Unable to set " + property + " to " + value
                         + " for " + spawnCategory.name() + " in " + world.getName() + ": " + e.getMessage()));
-
-        worldManager.saveWorldsConfig();
     }
 }

src/main/java/org/mvplugins/multiverse/core/commands/ModifyCommand.java

@@ -94,28 +94,28 @@ class ModifyCommand extends CoreCommand {
         }
 
         StringPropertyHandle worldPropertyHandle = world.getStringPropertyHandle();
-        worldPropertyHandle.modifyPropertyString(issuer.getIssuer(), propertyName, propertyValue, action).onSuccess(ignore -> {
-            issuer.sendMessage(MVCorei18n.MODIFY_SUCCESS,
+        worldPropertyHandle.modifyPropertyString(issuer.getIssuer(), propertyName, propertyValue, action)
+                .andThenTry(worldManager::saveWorldsConfig)
+                .onSuccess(ignore -> issuer.sendMessage(MVCorei18n.MODIFY_SUCCESS,
                     replace("{action}").with(action.name().toLowerCase()),
                     replace("{property}").with(propertyName),
                     Replace.VALUE.with(worldPropertyHandle.getProperty(propertyName).getOrNull()),
-                    Replace.WORLD.with(world.getName()));
-            worldManager.saveWorldsConfig();
-        }).onFailure(exception -> {
-            if (propertyValue == null) {
-                issuer.sendMessage(MVCorei18n.MODIFY_FAILURE_NOVALUE,
-                        replace("{action}").with(action.name().toLowerCase()),
-                        replace("{property}").with(propertyName),
-                        Replace.WORLD.with(world.getName()),
-                        Replace.ERROR.with(exception.getMessage()));
-            } else {
-                issuer.sendMessage(MVCorei18n.MODIFY_FAILURE,
-                        replace("{action}").with(action.name().toLowerCase()),
-                        replace("{property}").with(propertyName),
-                        Replace.VALUE.with(propertyValue),
-                        Replace.WORLD.with(world.getName()),
-                        Replace.ERROR.with(exception.getMessage()));
-            }
+                    Replace.WORLD.with(world.getName())))
+                .onFailure(exception -> {
+                    if (propertyValue == null) {
+                        issuer.sendMessage(MVCorei18n.MODIFY_FAILURE_NOVALUE,
+                                replace("{action}").with(action.name().toLowerCase()),
+                                replace("{property}").with(propertyName),
+                                Replace.WORLD.with(world.getName()),
+                                Replace.ERROR.with(exception.getMessage()));
+                    } else {
+                        issuer.sendMessage(MVCorei18n.MODIFY_FAILURE,
+                                replace("{action}").with(action.name().toLowerCase()),
+                                replace("{property}").with(propertyName),
+                                Replace.VALUE.with(propertyValue),
+                                Replace.WORLD.with(world.getName()),
+                                Replace.ERROR.with(exception.getMessage()));
+                    }
         });
     }
 

src/main/java/org/mvplugins/multiverse/core/commands/SetSpawnCommand.java

@@ -63,7 +63,7 @@ class SetSpawnCommand extends CoreCommand {
 
         worldManager.getLoadedWorld(location.getWorld())
                 .peek(mvWorld -> mvWorld.setSpawnLocation(location)
-                        .flatMap(ignore -> worldManager.saveWorldsConfig())
+                        .andThenTry(worldManager::saveWorldsConfig)
                         .onSuccess(ignore -> issuer.sendMessage(MVCorei18n.SETSPAWN_SUCCESS,
                                 Replace.WORLD.with(mvWorld.getName()),
                                 Replace.LOCATION.with(prettyLocation(location))))

src/main/java/org/mvplugins/multiverse/core/world/WorldConfig.java

@@ -130,7 +130,9 @@ final class WorldConfig {
     }
 
     Try<Void> save() {
-        return configHandle.save();
+        return configHandle.save().onFailure(ex ->
+                Logging.warning("Failed to save world config for world '%s'. %s",
+                        worldName, ex.getLocalizedMessage()));
     }
 
     ConfigurationSection getConfigurationSection() {