From 2427d3835e5c3a2ca661df953b1ef9d8d55d4be3 Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Sun, 3 Apr 2011 23:05:25 -0700 Subject: [PATCH] Added a check for when the old and new data folders are the same. By: sk89q --- .../main/java/org/bukkit/plugin/java/JavaPluginLoader.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/paper-api/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/paper-api/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java index 10b0fd3eb8..55ff75aca5 100644 --- a/paper-api/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/paper-api/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -72,7 +72,9 @@ public final class JavaPluginLoader implements PluginLoader { File oldDataFolder = getDataFolder(file); // Found old data folder - if (dataFolder.isDirectory() && oldDataFolder.isDirectory()) { + if (dataFolder.equals(oldDataFolder)) { + // They are equal -- nothing needs to be done! + } else if (dataFolder.isDirectory() && oldDataFolder.isDirectory()) { server.getLogger().log( Level.INFO, String.format( "While loading %s (%s) found old-data folder: %s next to the new one: %s", description.getName(),