From 3d07375cff7cf5d0f77b71d590f781bb2dad1ddb Mon Sep 17 00:00:00 2001 From: boy0001 Date: Sat, 20 Dec 2014 20:23:27 +1100 Subject: [PATCH] formatting --- PlotSquared/pom.xml | 2 +- .../main/java/com/intellectualcrafters/plot/config/C.java | 7 ++++++- .../plot/database/PlotMeConverter.java | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/PlotSquared/pom.xml b/PlotSquared/pom.xml index 00c2721eb..670281dbf 100644 --- a/PlotSquared/pom.xml +++ b/PlotSquared/pom.xml @@ -6,7 +6,7 @@ com.intellectualcrafters PlotSquared - 2.4.1 + 2.4.2 PlotSquared jar 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 e908a8652..e4ae0ae77 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(toString(), lang).getTranslated().replaceAll("&-", "\n").replaceAll("\\n", "\n"); + return manager.getTranslated(name(), lang).getTranslated().replaceAll("&-", "\n").replaceAll("\\n", "\n"); /* * if (PlotMain.translations != null) { * final String t = PlotMain.translations.getString(this.toString()); @@ -486,4 +486,9 @@ 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 590ee9e82..fb60ba5a4 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java @@ -73,7 +73,7 @@ public class PlotMeConverter { @Override public void run() { sendMessage("&7Conversion has started"); - sendMessage("7Caching playerdata..."); + sendMessage("&7Caching playerdata..."); final ArrayList createdPlots = new ArrayList<>(); // Online Mode final boolean online = Bukkit.getServer().getOnlineMode() && !Settings.OFFLINE_MODE;