Merge pull request #3210 from Multiverse/feat/clone-save

Add an option to force save world to disk before cloning world

Author: benwoo1110

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

@@ -66,7 +66,8 @@ void onCloneCommand(
         CloneWorldOptions cloneWorldOptions = CloneWorldOptions.fromTo(world, newWorldName)
                 .keepWorldConfig(!parsedFlags.hasFlag(flags.resetWorldConfig))
                 .keepGameRule(!parsedFlags.hasFlag(flags.resetGamerules))
-                .keepWorldBorder(!parsedFlags.hasFlag(flags.resetWorldBorder));
+                .keepWorldBorder(!parsedFlags.hasFlag(flags.resetWorldBorder))
+                .forceSave(parsedFlags.hasFlag(flags.forceSave));
         worldManager.cloneWorld(cloneWorldOptions)
                 .onSuccess(newWorld -> {
                     Logging.fine("World clone success: " + newWorld);
@@ -98,6 +99,10 @@ private Flags(@NotNull CommandFlagsManager flagsManager) {
         private final CommandFlag resetWorldBorder = flag(CommandFlag.builder("--reset-world-border")
                 .addAlias("-wb")
                 .build());
+
+        private final CommandFlag forceSave = flag(CommandFlag.builder("--force-save")
+                .addAlias("-s")
+                .build());
     }
 
     @Service

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

@@ -612,8 +612,11 @@ private Attempt<CloneWorldOptions, CloneFailureReason> cloneWorldValidateWorld(
         return worldActionResult(options);
     }
 
-    private Attempt<CloneWorldOptions, CloneFailureReason> cloneWorldCopyFolder(
-            @NotNull CloneWorldOptions options) {
+    private Attempt<CloneWorldOptions, CloneFailureReason> cloneWorldCopyFolder(@NotNull CloneWorldOptions options) {
+        if (options.forceSave()) {
+            Logging.finer("Force saving world before cloning: " + options.world().getName());
+            options.world().getBukkitWorld().peek(World::save);
+        }
         File worldFolder = options.world().getBukkitWorld().map(World::getWorldFolder).get();
         File newWorldFolder = new File(Bukkit.getWorldContainer(), options.newWorldName());
         return fileUtils.copyFolder(worldFolder, newWorldFolder, CLONE_IGNORE_FILES).fold(

src/main/java/org/mvplugins/multiverse/core/world/options/CloneWorldOptions.java

@@ -23,6 +23,7 @@ public static CloneWorldOptions fromTo(LoadedMultiverseWorld world, String newWo
     private final String newWorldName;
     private boolean keepGameRule = true;
     private boolean keepWorldConfig = true;
+    private boolean forceSave = false;
 
     private boolean keepWorldBorder = true;
 
@@ -115,4 +116,24 @@ public boolean keepWorldConfig() {
     public boolean keepWorldBorder() {
         return keepWorldBorder;
     }
+
+    /**
+     * Sets whether to force save the world to disk before clone copying.
+     *
+     * @param forceSaveInput Whether to force save the world to disk before clone copying.
+     * @return This {@link CloneWorldOptions} instance.
+     */
+    public @NotNull CloneWorldOptions forceSave(boolean forceSaveInput) {
+        this.forceSave = forceSaveInput;
+        return this;
+    }
+
+    /**
+     * Gets whether to force save the world to disk before clone copying.
+     *
+     * @return Whether to force save the world to disk before clone copying.
+     */
+    public boolean forceSave() {
+        return forceSave;
+    }
 }