From a45833944b20d61020764af28d34984b60f3563a Mon Sep 17 00:00:00 2001 From: Trent Hensler Date: Mon, 19 Mar 2018 23:00:47 -0700 Subject: [PATCH] Allow warzone and safezone to be colored in f map --- src/main/java/com/massivecraft/factions/Conf.java | 2 ++ .../massivecraft/factions/zcore/persist/MemoryBoard.java | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/Conf.java b/src/main/java/com/massivecraft/factions/Conf.java index 48bf1603..a425cccf 100644 --- a/src/main/java/com/massivecraft/factions/Conf.java +++ b/src/main/java/com/massivecraft/factions/Conf.java @@ -21,6 +21,8 @@ public class Conf { public static ChatColor colorEnemy = ChatColor.RED; public static ChatColor colorPeaceful = ChatColor.GOLD; + public static ChatColor colorWilderness = ChatColor.GRAY; + public static ChatColor colorSafezone = ChatColor.GOLD; public static ChatColor colorWar = ChatColor.DARK_RED; // Power diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryBoard.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryBoard.java index 986d85c8..bce8a94b 100644 --- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryBoard.java +++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryBoard.java @@ -284,7 +284,7 @@ public abstract class MemoryBoard extends Board { Faction factionHere = getFactionAt(flocationHere); Relation relation = fplayer.getRelationTo(factionHere); if (factionHere.isWilderness()) { - row.then("-").color(ChatColor.GRAY); + row.then("-").color(Conf.colorWilderness); // Check for claimat permission and if so, let them claim at ;D // TODO: TEMP DISABLED UNTIL FIXED PROPERLY :( if (false) { //fplayer.getPlayer().hasPermission(Permission.CLAIMAT.node)) { @@ -292,9 +292,9 @@ public abstract class MemoryBoard extends Board { .command(String.format("/f claimat %s %d %d", flocation.getWorldName(), dx, dz)); } } else if (factionHere.isSafeZone()) { - row.then("+").color(Conf.colorPeaceful); + row.then("+").color(Conf.colorSafezone); } else if (factionHere.isWarZone()) { - row.then("+").color(ChatColor.DARK_RED); + row.then("+").color(Conf.colorWar); } else if (factionHere == faction || factionHere == factionLoc || relation.isAtLeast(Relation.ALLY) || (Conf.showNeutralFactionsOnMap && relation.equals(Relation.NEUTRAL)) || (Conf.showEnemyFactionsOnMap && relation.equals(Relation.ENEMY))) {