From c3e1e6547ad2e3323338119a1d0623e6f3d5a075 Mon Sep 17 00:00:00 2001 From: Trent Hensler Date: Thu, 4 Jan 2018 00:07:51 -0800 Subject: [PATCH] Consistent naming --- .../massivecraft/factions/util/PlaceholderAPIManager.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/util/PlaceholderAPIManager.java b/src/main/java/com/massivecraft/factions/util/PlaceholderAPIManager.java index 382e4e01..812b89be 100644 --- a/src/main/java/com/massivecraft/factions/util/PlaceholderAPIManager.java +++ b/src/main/java/com/massivecraft/factions/util/PlaceholderAPIManager.java @@ -66,12 +66,12 @@ public class PlaceholderAPIManager extends EZPlaceholderHook { case "faction_powerboost": double powerBoost = faction.getPowerBoost(); return (powerBoost == 0.0) ? "" : (powerBoost > 0.0 ? TL.COMMAND_SHOW_BONUS.toString() : TL.COMMAND_SHOW_PENALTY.toString() + powerBoost + ")"); - case "leader": + case "faction_leader": FPlayer fAdmin = faction.getFPlayerAdmin(); return fAdmin == null ? "Server" : fAdmin.getName().substring(0, fAdmin.getName().length() > 14 ? 13 : fAdmin.getName().length()); - case "warps": + case "faction_warps": return String.valueOf(faction.getWarps().size()); - case "raidable": + case "faction_raidable": boolean raid = P.p.getConfig().getBoolean("hcf.raidable", false) && faction.getLandRounded() >= faction.getPowerRounded(); return raid ? TL.RAIDABLE_TRUE.toString() : TL.RAIDABLE_FALSE.toString(); case "faction_home_world": @@ -102,6 +102,8 @@ public class PlaceholderAPIManager extends EZPlaceholderHook { return String.valueOf(faction.getKills()); case "faction_deaths": return String.valueOf(faction.getDeaths()); + case "faction_maxvaults": + return String.valueOf(faction.getMaxVaults()); } return null;