EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 21:26:45 +01:00
Code Issues Projects Releases Wiki Activity

Another temporary fix.

Browse Source
This commit is contained in:
boy0001 2014-12-21 18:54:22 +11:00
parent 2d1761f807
commit e6d682fd5a
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PlotSquared/src/main/java/com/intellectualcrafters/plot/config/C.java
View File

@ -463,7 +463,7 @@ public enum C {
* @return translated if exists else default * @return translated if exists else default
*/ */
public String s() { 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) { * if (PlotMain.translations != null) {
* final String t = PlotMain.translations.getString(this.toString()); * final String t = PlotMain.translations.getString(this.toString());
@ -486,9 +486,4 @@ public enum C {
public String translated() { public String translated() {
return ChatColor.translateAlternateColorCodes('&', this.s()); return ChatColor.translateAlternateColorCodes('&', this.s());
} }
@Override
public String toString() {
return this.s();
}
} }

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java
View File

@ -277,6 +277,6 @@ public class PlotMeConverter {
PlotMain.sendConsoleSenderMessage("&3PlotMe&8->&3PlotSquared&8:&7 Conversion has finished"); 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."); 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);
} }
} }

13
PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
View File

@ -265,14 +265,21 @@ public class SQLManager implements AbstractDB {
} }
stmt.executeUpdate(); stmt.executeUpdate();
stmt.close(); stmt.close();
} catch (final SQLException e) { } catch (final Exception e) {
PlotMain.sendConsoleSenderMessage("&7[WARN] "+"Could not bulk save. Conversion may be slower..."); e.printStackTrace();
PlotMain.sendConsoleSenderMessage("&6[WARN] "+"Could not bulk save. Conversion may be slower...");
try { try {
for (Plot plot : plots) { 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) { catch (Exception e2) {
e2.printStackTrace();
PlotMain.sendConsoleSenderMessage("&c[ERROR] "+"Failed to save plots!"); PlotMain.sendConsoleSenderMessage("&c[ERROR] "+"Failed to save plots!");
} }
} }