From ec754c39b7124cdd533ecae34edecf1c21538c2b Mon Sep 17 00:00:00 2001 From: boy0001 Date: Mon, 10 Nov 2014 09:55:45 +1100 Subject: [PATCH] plot info and flags --- .../java/com/intellectualcrafters/plot/C.java | 18 +++++++++--------- .../plot/commands/Info.java | 2 +- .../plot/database/SQLManager.java | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/C.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/C.java index d2f6ea951..43e4d17cf 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/C.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/C.java @@ -246,15 +246,15 @@ public enum C { "&6Can build&7: &a%build%" ),*/ PLOT_INFO( - "&cID: &6%id%&c, " + - "&cAlias: &6%alias%&c, " + - "&cOwner: &6%owner%&c, " + - "&cBiome: &6%biome%&c, " + - "&cCan Build: &6%build%&c, " + - "&cRating: &6%rating%&c/&610&c, " + - "&cHelpers:&6%helpers%&c, " + - "&cTrusted:&6%trusted%&c, " + - "&cDenied:&6%denied%&c, " + + "&cID: &6%id%&c\n" + + "&cAlias: &6%alias%&c\n" + + "&cOwner: &6%owner%&c\n" + + "&cBiome: &6%biome%&c\n" + + "&cCan Build: &6%build%&c\n" + + "&cRating: &6%rating%&c/&610&c\n" + + "&cHelpers: &6%helpers%&c\n" + + "&cTrusted: &6%trusted%&c\n" + + "&cDenied: &6%denied%&c\n" + "&cFlags: &6%flags%" ), PLOT_INFO_HELPERS("&6Helpers&7: %helpers%"), diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Info.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Info.java index c8353b80d..35435b38d 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Info.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Info.java @@ -169,7 +169,7 @@ public class Info extends SubCommand { final String trusted = getPlayerList(plot.trusted); final String denied = getPlayerList(plot.denied); final String rating = String.format("%.1f", DBFunc.getRatings(plot)); - final String flags = "&3" + (StringUtils.join(plot.settings.getFlags(), "").length() > 0 ? StringUtils.join(plot.settings.getFlags(), "&7, &3") : "none"); + final String flags = "&6" + (StringUtils.join(plot.settings.getFlags(), "").length() > 0 ? StringUtils.join(plot.settings.getFlags(), "&7, &6") : "none"); final boolean build = player == null ? true : plot.hasRights(player); String owner = "none"; diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java index 2bedd36be..8a6f8204d 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java @@ -567,7 +567,7 @@ public class SQLManager extends AbstractDB { if (element.contains(":")) { final String[] split = element.split(":"); try { - flags.add(new Flag(FlagManager.getFlag(split[0], true), split[1].replace("�", ",").replace("�", ":"))); + flags.add(new Flag(FlagManager.getFlag(split[0], true), split[1].replaceAll("\u00AF", ":").replaceAll("´", ","))); } catch (final Exception e) { exception = true; } @@ -640,7 +640,7 @@ public class SQLManager extends AbstractDB { if (i != 0) { flag_string.append(","); } - flag_string.append(flag.getKey() + ":" + flag.getValue()); + flag_string.append(flag.getKey() + ":" + flag.getValue().replaceAll(":", "\u00AF").replaceAll(",", "\u00B4")); i++; } runTask(new Runnable() {