From 8af57197ce9389f4d83f890db3c7e0a5843c491b Mon Sep 17 00:00:00 2001
From: drtshock <drtshock13@gmail.com>
Date: Sat, 2 May 2015 21:03:12 -0500
Subject: [PATCH] Remove errant format specifier. Resolves #301. Bumping to
 .16-SNAPSHOT so I can post this to spigot and then not deal with this
 anymore.

---
 pom.xml                                                    | 2 +-
 src/main/java/com/massivecraft/factions/zcore/MPlugin.java | 6 ++++++
 src/main/java/com/massivecraft/factions/zcore/util/TL.java | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 33620bef..e3a0fb8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.massivecraft</groupId>
     <artifactId>Factions</artifactId>
-    <version>1.6.9.5-U0.1.15-SNAPSHOT</version>
+    <version>1.6.9.5-U0.1.16-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Factions</name>
diff --git a/src/main/java/com/massivecraft/factions/zcore/MPlugin.java b/src/main/java/com/massivecraft/factions/zcore/MPlugin.java
index c4446f02..743ee498 100644
--- a/src/main/java/com/massivecraft/factions/zcore/MPlugin.java
+++ b/src/main/java/com/massivecraft/factions/zcore/MPlugin.java
@@ -164,6 +164,12 @@ public abstract class MPlugin extends JavaPlugin {
             }
         }
 
+        // Remove this here because I'm sick of dealing with bug reports due to bad decisions on my part.
+        if (conf.getString(TL.COMMAND_SHOW_POWER.getPath(), "").contains("%5$s")) {
+            conf.set(TL.COMMAND_SHOW_POWER.getPath(), TL.COMMAND_SHOW_POWER.getDefault());
+            log(Level.INFO, "Removed errant format specifier from f show power.");
+        }
+
         TL.setFile(conf);
         try {
             conf.save(lang);
diff --git a/src/main/java/com/massivecraft/factions/zcore/util/TL.java b/src/main/java/com/massivecraft/factions/zcore/util/TL.java
index 36c4e421..c01e87b1 100644
--- a/src/main/java/com/massivecraft/factions/zcore/util/TL.java
+++ b/src/main/java/com/massivecraft/factions/zcore/util/TL.java
@@ -398,7 +398,7 @@ public enum TL {
     COMMAND_RELATIONS_PROPOSAL_2("<i>Type <c>/%1$s %2$s %3$s<i> to accept."),
     COMMAND_RELATIONS_PROPOSAL_SENT("%1$s<i> were informed that you wish to be %2$s"),
 
-    COMMAND_RELOAD_TIME("<i>Reloaded <h>conf.json <i>from disk, took <h>%1$d ms<i>."),
+    COMMAND_RELOAD_TIME("<i>Reloaded <h>all configuration files <i>from disk, took <h>%1$d ms<i>."),
     COMMAND_RELOAD_DESCRIPTION("Reload data file(s) from disk"),
 
     COMMAND_SAFEUNCLAIMALL_DESCRIPTION("Unclaim all safezone land"),
@@ -435,7 +435,7 @@ public enum TL {
     COMMAND_SHOW_JOINING("<a>Joining: <i>%1$s "),
     COMMAND_SHOW_INVITATION("invitation is required"),
     COMMAND_SHOW_UNINVITED("no invitation is needed"),
-    COMMAND_SHOW_POWER("<a>Land / Power / Maxpower: <i> %1$d/%2$d/%3$d %4$s. <a>Raidable: <i>%5$s"),
+    COMMAND_SHOW_POWER("<a>Land / Power / Maxpower: <i> %1$d/%2$d/%3$d %4$s."),
     COMMAND_SHOW_BONUS(" (bonus: "),
     COMMAND_SHOW_PENALTY(" (penalty: "),
     COMMAND_SHOW_DEPRECIATED("(%1$s depreciated)"), //This is spelled correctly.