Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-23 12:06:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

formatting

Browse Source
This commit is contained in:
boy0001 2014-12-20 20:23:27 +11:00
parent 6bfc0aaf9d
commit 3d07375cff
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PlotSquared/pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.intellectualcrafters</groupId> <groupId>com.intellectualcrafters</groupId>
<artifactId>PlotSquared</artifactId> <artifactId>PlotSquared</artifactId>
<version>2.4.1</version> <version>2.4.2</version>
<name>PlotSquared</name> <name>PlotSquared</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<build> <build>

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(toString(), lang).getTranslated().replaceAll("&-", "\n").replaceAll("\\n", "\n"); return manager.getTranslated(name(), 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,4 +486,9 @@ 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

@ -73,7 +73,7 @@ public class PlotMeConverter {
@Override @Override
public void run() { public void run() {
sendMessage("&7Conversion has started"); sendMessage("&7Conversion has started");
sendMessage("7Caching playerdata..."); sendMessage("&7Caching playerdata...");
final ArrayList<com.intellectualcrafters.plot.object.Plot> createdPlots = new ArrayList<>(); final ArrayList<com.intellectualcrafters.plot.object.Plot> createdPlots = new ArrayList<>();
// Online Mode // Online Mode
final boolean online = Bukkit.getServer().getOnlineMode() && !Settings.OFFLINE_MODE; final boolean online = Bukkit.getServer().getOnlineMode() && !Settings.OFFLINE_MODE;