diff options
| author | sk89q <the.sk89q@gmail.com> | 2011-04-03 23:05:25 -0700 |
|---|---|---|
| committer | sk89q <the.sk89q@gmail.com> | 2011-04-03 23:05:25 -0700 |
| commit | e6a51fb149574962e3dfd0ea1fad089d16593e00 (patch) | |
| tree | b9364666c1a41e1e42344c36c2716e441b3c5b06 /src | |
| parent | 43784649897962270b27e1e0c1d1736246c13fff (diff) | |
| download | bukkit-e6a51fb149574962e3dfd0ea1fad089d16593e00.tar bukkit-e6a51fb149574962e3dfd0ea1fad089d16593e00.tar.gz bukkit-e6a51fb149574962e3dfd0ea1fad089d16593e00.tar.lz bukkit-e6a51fb149574962e3dfd0ea1fad089d16593e00.tar.xz bukkit-e6a51fb149574962e3dfd0ea1fad089d16593e00.zip | |
Added a check for when the old and new data folders are the same.
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java index 10b0fd3e..55ff75ac 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/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(), |