1.5.0 Release Canidate 2 (Previously 1.4.3)

1 files changed, 17 insertions, 4 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java
index 381a41c..5e28258 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java
@@ -46,12 +46,25 @@ public class ConfigManager {
 
     private ConfigManager(String filename, String defaultFilename) {
 
+        File dataFolder = Main.getInstance().getDataFolder();
+        File oldDataFolder = new File(Main.getInstance().getDataFolder().getParent() + File.separator + "HideAndSeek");
+
         this.defaultFilename = defaultFilename;
-        this.file = new File(Main.getInstance().getDataFolder(), filename);
+        this.file = new File(dataFolder, filename);
+
+        if(oldDataFolder.exists()){
+            if(!dataFolder.exists()){
+                if(!oldDataFolder.renameTo(dataFolder)){
+                    throw new RuntimeException("Could not rename folder: " + oldDataFolder.getPath());
+                }
+            } else {
+                throw new RuntimeException("Plugin folders for HideAndSeek & KenshinsHideAndSeek both exists. There can only be one!");
+            }
+
+        }
 
-        File folder = Main.getInstance().getDataFolder();
-        if (!folder.exists()) {
-            if (!folder.mkdirs()) {
+        if (!dataFolder.exists()) {
+            if (!dataFolder.mkdirs()) {
                 throw new RuntimeException("Failed to make directory: " + file.getPath());
             }
         }