Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2025-02-22 06:41:23 +01:00
Code Issues Projects Releases Wiki Activity

Show truce factions on map. Adds showTruceFactionsOnMap to conf.json

Browse Source
This commit is contained in:
Trent Hensler 2019-04-03 19:37:00 -07:00
parent 43cf430e0e
commit f8386f9969
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,7 @@ public class Conf {
public static boolean showMapFactionKey = true;
public static boolean showNeutralFactionsOnMap = true;
public static boolean showEnemyFactionsOnMap = true;
public static boolean showTruceFactionsOnMap = true;
// Disallow joining/leaving/kicking while power is negative
public static boolean canLeaveWithNegativePower = true;

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

@ -304,7 +304,8 @@ public abstract class MemoryBoard extends Board {
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))) {
(Conf.showEnemyFactionsOnMap && relation.equals(Relation.ENEMY)) ||
Conf.showTruceFactionsOnMap && relation.equals(Relation.TRUCE)) {
if (!fList.containsKey(factionHere.getTag())) {
fList.put(factionHere.getTag(), Conf.mapKeyChrs[Math.min(chrIdx++, Conf.mapKeyChrs.length - 1)]);
}