SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove errant format specifier. Resolves #301.

Browse Source 
Bumping to .16-SNAPSHOT so I can post this to spigot and then not deal with this anymore.
This commit is contained in:
drtshock 2015-05-02 21:03:12 -05:00
parent 57c0c9fd09
commit 8af57197ce
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<groupId>com.massivecraft</groupId> <groupId>com.massivecraft</groupId>
<artifactId>Factions</artifactId> <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> <packaging>jar</packaging>
<name>Factions</name> <name>Factions</name>

6
src/main/java/com/massivecraft/factions/zcore/MPlugin.java
View File

@ -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); TL.setFile(conf);
try { try {
conf.save(lang); conf.save(lang);

4
src/main/java/com/massivecraft/factions/zcore/util/TL.java
View File

@ -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_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_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_RELOAD_DESCRIPTION("Reload data file(s) from disk"),
COMMAND_SAFEUNCLAIMALL_DESCRIPTION("Unclaim all safezone land"), COMMAND_SAFEUNCLAIMALL_DESCRIPTION("Unclaim all safezone land"),
@ -435,7 +435,7 @@ public enum TL {
COMMAND_SHOW_JOINING("<a>Joining: <i>%1$s "), COMMAND_SHOW_JOINING("<a>Joining: <i>%1$s "),
COMMAND_SHOW_INVITATION("invitation is required"), COMMAND_SHOW_INVITATION("invitation is required"),
COMMAND_SHOW_UNINVITED("no invitation is needed"), 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_BONUS(" (bonus: "),
COMMAND_SHOW_PENALTY(" (penalty: "), COMMAND_SHOW_PENALTY(" (penalty: "),
COMMAND_SHOW_DEPRECIATED("(%1$s depreciated)"), //This is spelled correctly. COMMAND_SHOW_DEPRECIATED("(%1$s depreciated)"), //This is spelled correctly.