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

color

Browse Source
This commit is contained in:
boy0001 2015-02-21 22:46:33 +11:00
parent b904cdd51b
commit 50c80ba5c4
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java
View File

@ -20,7 +20,6 @@ import java.util.UUID;
import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.economy.Economy;
import org.bukkit.ChatColor;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import com.intellectualcrafters.plot.commands.Cluster; import com.intellectualcrafters.plot.commands.Cluster;
@ -761,10 +760,10 @@ public class PlotSquared {
Settings.API_URL = config.getString("uuid.api.location"); Settings.API_URL = config.getString("uuid.api.location");
Settings.CUSTOM_API = config.getBoolean("uuid.api.custom"); Settings.CUSTOM_API = config.getBoolean("uuid.api.custom");
Settings.UUID_FECTHING = config.getBoolean("uuid.fetching"); Settings.UUID_FECTHING = config.getBoolean("uuid.fetching");
C.COLOR_1 = ChatColor.getByChar(style.getString("color.1")); C.COLOR_1 = "\u00A7" + (style.getString("color.1"));
C.COLOR_2 = ChatColor.getByChar(style.getString("color.2")); C.COLOR_2 = "\u00A7" + (style.getString("color.2"));
C.COLOR_3 = ChatColor.getByChar(style.getString("color.3")); C.COLOR_3 = "\u00A7" + (style.getString("color.3"));
C.COLOR_4 = ChatColor.getByChar(style.getString("color.4")); C.COLOR_4 = "\u00A7" + (style.getString("color.4"));
if (Settings.DEBUG) { if (Settings.DEBUG) {
final Map<String, String> settings = new HashMap<>(); final Map<String, String> settings = new HashMap<>();
settings.put("Kill Road Mobs", "" + Settings.KILL_ROAD_MOBS); settings.put("Kill Road Mobs", "" + Settings.KILL_ROAD_MOBS);
@ -786,10 +785,10 @@ public class PlotSquared {
private static void setupStyle() { private static void setupStyle() {
style.set("version", VERSION); style.set("version", VERSION);
final Map<String, Object> o = new HashMap<>(); final Map<String, Object> o = new HashMap<>();
o.put("color.1", C.COLOR_1.getChar()); o.put("color.1", C.COLOR_1.substring(1));
o.put("color.2", C.COLOR_2.getChar()); o.put("color.2", C.COLOR_2.substring(1));
o.put("color.3", C.COLOR_3.getChar()); o.put("color.3", C.COLOR_3.substring(1));
o.put("color.4", C.COLOR_4.getChar()); o.put("color.4", C.COLOR_4.substring(1));
for (final Entry<String, Object> node : o.entrySet()) { for (final Entry<String, Object> node : o.entrySet()) {
if (!style.contains(node.getKey())) { if (!style.contains(node.getKey())) {
style.set(node.getKey(), node.getValue()); style.set(node.getKey(), node.getValue());

7
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Ban.java
View File

@ -21,13 +21,14 @@ public class Ban extends SubCommand {
if (args.length < 1) { if (args.length < 1) {
return MainUtil.sendMessage(plr, "&cUsage: &c" + this.usage); return MainUtil.sendMessage(plr, "&cUsage: &c" + this.usage);
} }
if (!BukkitPlayerFunctions.isInPlot(plr)) { Plot plot = MainUtil.getPlot(plr.getLocation());
if (plot == null) {
return sendMessage(plr, C.NOT_IN_PLOT); return sendMessage(plr, C.NOT_IN_PLOT);
} }
final Plot plot = BukkitPlayerFunctions.getCurrentPlot(plr); if (!plot.isAdded(plr.getUUID())) {
if (!plot.hasRights(plr)) {
return sendMessage(plr, C.NO_PLOT_PERMS); return sendMessage(plr, C.NO_PLOT_PERMS);
} }
return plr.performCommand("plot denied add " + args[0]); return plr.performCommand("plot denied add " + args[0]);
} }
} }

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/config/C.java
View File

@ -444,7 +444,7 @@ public enum C {
* @see com.intellectualsites.translation.TranslationLanguage * @see com.intellectualsites.translation.TranslationLanguage
*/ */
protected final static TranslationLanguage lang = new TranslationLanguage("PlotSquared", "this", "use"); protected final static TranslationLanguage lang = new TranslationLanguage("PlotSquared", "this", "use");
public static ChatColor COLOR_1 = ChatColor.GOLD, COLOR_2 = ChatColor.GRAY, COLOR_3 = ChatColor.DARK_GRAY, COLOR_4 = ChatColor.DARK_AQUA; public static String COLOR_1 = "\u00A76", COLOR_2 = "\u00A77", COLOR_3 = "\u00A78", COLOR_4 = "\u00A73";
/** /**
* The TranslationManager * The TranslationManager
* *