createworld: don't allow copying into pre-existing folder path

DenizenScript · Oct 15, 2020 · bdf79da · bdf79da
1 parent 70cd17d
commit bdf79da
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...in/src/main/java/com/denizenscript/denizen/scripts/commands/world/CreateWorldCommand.java b/...in/src/main/java/com/denizenscript/denizen/scripts/commands/world/CreateWorldCommand.java
@@ -146,8 +146,8 @@ public void execute(ScriptEntry scriptEntry) {
                     Debug.echoError(scriptEntry.getResidingQueue(), "Invalid copy from world name!");
                     return false;
                 }
-                File newFolder = new File(worldName.asString());
                 File folder = new File(copy_from.asString().replace("w@", ""));
+                final File newFolder = new File(worldName.asString());
                 if (!Utilities.canReadFile(folder)) {
                     Debug.echoError("Cannot copy from that folder path.");
                     return false;
@@ -160,6 +160,10 @@ public void execute(ScriptEntry scriptEntry) {
                     Debug.echoError(scriptEntry.getResidingQueue(), "Invalid copy from world folder - does not exist!");
                     return false;
                 }
+                if (newFolder.exists()) {
+                    Debug.echoError("Cannot copy to new world - that folder already exists.");
+                    return false;
+                }
                 CoreUtilities.copyDirectory(folder, newFolder, excludedExtensionsForCopyFrom);
                 Debug.echoDebug(scriptEntry, "Copied " + folder.getName() + " to " + newFolder.getName());
                 File file = new File(worldName.asString() + "/uid.dat");