SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set placeholders in main scoreboard too

Browse Source
This commit is contained in:
Trent Hensler 2018-02-17 12:21:15 -06:00
parent d45b5ac612
commit ca0991504b
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/massivecraft/factions/scoreboards/FSidebarProvider.java
View File

@ -5,7 +5,6 @@ import com.massivecraft.factions.Faction;
import com.massivecraft.factions.P; import com.massivecraft.factions.P;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import com.massivecraft.factions.zcore.util.TagUtil; import com.massivecraft.factions.zcore.util.TagUtil;
import me.clip.placeholderapi.PlaceholderAPI;
import java.util.List; import java.util.List;
@ -16,17 +15,15 @@ public abstract class FSidebarProvider {
public abstract List<String> getLines(FPlayer fplayer); public abstract List<String> getLines(FPlayer fplayer);
public String replaceTags(FPlayer fPlayer, String s) { public String replaceTags(FPlayer fPlayer, String s) {
s = TagUtil.parsePlaceholders(fPlayer.getPlayer(), s);
return qualityAssure(TagUtil.parsePlain(fPlayer, s)); return qualityAssure(TagUtil.parsePlain(fPlayer, s));
} }
public String replaceTags(Faction faction, FPlayer fPlayer, String s) { public String replaceTags(Faction faction, FPlayer fPlayer, String s) {
// Run through Placeholder API first // Run through Placeholder API first
if (P.p.isClipPlaceholderAPIHooked() && fPlayer.isOnline()) { s = TagUtil.parsePlaceholders(fPlayer.getPlayer(), s);
s = PlaceholderAPI.setPlaceholders(fPlayer.getPlayer(), s);
}
if (P.p.isMVdWPlaceholderAPIHooked() && fPlayer.isOnline()) {
s = be.maximvdw.placeholderapi.PlaceholderAPI.replacePlaceholders(fPlayer.getPlayer(), s);
}
return qualityAssure(TagUtil.parsePlain(faction, fPlayer, s)); return qualityAssure(TagUtil.parsePlain(faction, fPlayer, s));
} }