From e6d682fd5a2e599029bcc0cf5b26533ca25e36f5 Mon Sep 17 00:00:00 2001
From: boy0001 <jessepaleg@gmail.com>
Date: Sun, 21 Dec 2014 18:54:22 +1100
Subject: [PATCH] Another temporary fix.

---
 .../com/intellectualcrafters/plot/config/C.java     |  7 +------
 .../plot/database/PlotMeConverter.java              |  2 +-
 .../plot/database/SQLManager.java                   | 13 ++++++++++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/C.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/C.java
index e4ae0ae77..e908a8652 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/C.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/C.java
@@ -463,7 +463,7 @@ public enum C {
      * @return translated if exists else default
      */
     public String s() {
-        return manager.getTranslated(name(), lang).getTranslated().replaceAll("&-", "\n").replaceAll("\\n", "\n");
+        return manager.getTranslated(toString(), lang).getTranslated().replaceAll("&-", "\n").replaceAll("\\n", "\n");
         /*
          * if (PlotMain.translations != null) {
          * final String t = PlotMain.translations.getString(this.toString());
@@ -486,9 +486,4 @@ public enum C {
     public String translated() {
         return ChatColor.translateAlternateColorCodes('&', this.s());
     }
-    
-    @Override
-    public String toString() {
-        return this.s();
-    }
 }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java
index 85705c463..fb60ba5a4 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java
@@ -277,6 +277,6 @@ public class PlotMeConverter {
                 PlotMain.sendConsoleSenderMessage("&3PlotMe&8->&3PlotSquared&8:&7 Conversion has finished");
                 PlotMain.sendConsoleSenderMessage("&cAlthough the server may be functional in it's current state, it is recommended that you restart the server and remove PlotMe to finalize the installation. Please make careful note of any warning messages that may have showed up during conversion.");
             }
-        }, 300);
+        }, 20);
     }
 }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
index c7582f4f9..6e0a7d0c6 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
@@ -265,14 +265,21 @@ public class SQLManager implements AbstractDB {
             }
             stmt.executeUpdate();
             stmt.close();
-        } catch (final SQLException e) {
-            PlotMain.sendConsoleSenderMessage("&7[WARN] "+"Could not bulk save. Conversion may be slower...");
+        } catch (final Exception e) {
+            e.printStackTrace();
+            PlotMain.sendConsoleSenderMessage("&6[WARN] "+"Could not bulk save. Conversion may be slower...");
             try {
                 for (Plot plot : plots) {
-                    createPlot(plot);
+                    try {
+                        createPlot(plot);
+                    }
+                    catch (Exception e3) {
+                        PlotMain.sendConsoleSenderMessage("&c[ERROR] "+"Failed to save plot: "+plot.id);
+                    }
                 }
             }
             catch (Exception e2) {
+                e2.printStackTrace();
                 PlotMain.sendConsoleSenderMessage("&c[ERROR] "+"Failed to save plots!");
             }
         }