From ca0991504b9fff6a9268c156e29d8bff71b9367e Mon Sep 17 00:00:00 2001 From: Trent Hensler Date: Sat, 17 Feb 2018 12:21:15 -0600 Subject: [PATCH] Set placeholders in main scoreboard too --- .../factions/scoreboards/FSidebarProvider.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/scoreboards/FSidebarProvider.java b/src/main/java/com/massivecraft/factions/scoreboards/FSidebarProvider.java index 1f29c66e..744b0893 100644 --- a/src/main/java/com/massivecraft/factions/scoreboards/FSidebarProvider.java +++ b/src/main/java/com/massivecraft/factions/scoreboards/FSidebarProvider.java @@ -5,7 +5,6 @@ import com.massivecraft.factions.Faction; import com.massivecraft.factions.P; import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TagUtil; -import me.clip.placeholderapi.PlaceholderAPI; import java.util.List; @@ -16,17 +15,15 @@ public abstract class FSidebarProvider { public abstract List getLines(FPlayer fplayer); public String replaceTags(FPlayer fPlayer, String s) { + s = TagUtil.parsePlaceholders(fPlayer.getPlayer(), s); + return qualityAssure(TagUtil.parsePlain(fPlayer, s)); } public String replaceTags(Faction faction, FPlayer fPlayer, String s) { // Run through Placeholder API first - if (P.p.isClipPlaceholderAPIHooked() && fPlayer.isOnline()) { - s = PlaceholderAPI.setPlaceholders(fPlayer.getPlayer(), s); - } - if (P.p.isMVdWPlaceholderAPIHooked() && fPlayer.isOnline()) { - s = be.maximvdw.placeholderapi.PlaceholderAPI.replacePlaceholders(fPlayer.getPlayer(), s); - } + s = TagUtil.parsePlaceholders(fPlayer.getPlayer(), s); + return qualityAssure(TagUtil.parsePlain(faction, fPlayer, s)); }