Fix merge conflicts

This commit is contained in:
Telesphoreo 2023-09-27 15:30:00 -05:00
parent 1a6b10c10f
commit 1a20bc3e54

View File

@ -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 " WorldEdit.logger.warn("Editing without a Bukkit adapter has been enabled. You will not receive support "
+ "for any issues that arise as a result."); + "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 @Override