From 1a20bc3e542f5aa82303b7ba897a2fe12ea41825 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Wed, 27 Sep 2023 15:30:00 -0500 Subject: [PATCH] Fix merge conflicts --- .../worldedit/bukkit/BukkitConfiguration.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitConfiguration.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitConfiguration.java index a969167af..46ca0bb55 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitConfiguration.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitConfiguration.java @@ -52,25 +52,6 @@ public class BukkitConfiguration extends YAMLConfiguration { WorldEdit.logger.warn("Editing without a Bukkit adapter has been enabled. You will not receive support " + "for any issues that arise as a result."); } - migrateLegacyFolders(); - } - - private void migrateLegacyFolders() { - migrate(saveDir, "schematics"); - migrate("drawings", "draw.js images"); - } - - private void migrate(String file, String name) { - File fromDir = new File(".", file); - File toDir = new File(getWorkingDirectoryPath().toFile(), file); - if (fromDir.exists() & !toDir.exists()) { - if (fromDir.renameTo(toDir)) { - plugin.getLogger().info("Migrated " + name + " folder '" + file - + "' from server root to plugin data folder."); - } else { - plugin.getLogger().warning("Error while migrating " + name + " folder!"); - } - } } @Override