Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-12-02 15:13:33 +01:00
Code Issues Projects Releases Wiki Activity

Allow warzone and safezone to be colored in f map

Browse Source
This commit is contained in:
Trent Hensler 2018-03-19 23:00:47 -07:00
parent 3ff319dc27
commit a45833944b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/massivecraft/factions/Conf.java
View File

@ -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

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

@ -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))) {