Blacklisted Names & Misc changes to setup for new revamp

This commit is contained in:
Driftay
2019-11-07 07:09:45 -05:00
parent 441382acdc
commit d77ee76ea7
11 changed files with 225 additions and 126 deletions

View File

@@ -3,6 +3,7 @@ package com.massivecraft.factions.util;
import com.massivecraft.factions.*;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.tag.Tag;
import com.massivecraft.factions.zcore.util.TL;
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import me.clip.placeholderapi.expansion.Relational;
@@ -104,6 +105,10 @@ public class ClipPlaceholderAPIManager extends PlaceholderExpansion implements R
// Then Faction stuff
case "faction_name":
return fPlayer.hasFaction() ? faction.getTag() : TL.NOFACTION_PREFIX.toString();
case "faction_name_custom":
return fPlayer.hasFaction() ? Tag.parsePlain(fPlayer, TL.PLACEHOLDER_CUSTOM_FACTION.toString()) : "";
case "faction_only_space":
return fPlayer.hasFaction() ? " " : "";
case "faction_power":
return String.valueOf(faction.getPowerRounded());
case "faction_powermax":