Add placeholders to f show
This commit is contained in:
parent
3f1edf1096
commit
d45b5ac612
@ -7,6 +7,7 @@ import com.massivecraft.factions.struct.Permission;
|
||||
import com.massivecraft.factions.zcore.util.TL;
|
||||
import com.massivecraft.factions.zcore.util.TagReplacer;
|
||||
import com.massivecraft.factions.zcore.util.TagUtil;
|
||||
import me.clip.placeholderapi.PlaceholderAPI;
|
||||
import mkremins.fanciful.FancyMessage;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@ -87,6 +88,9 @@ public class CmdShow extends FCommand {
|
||||
if (parsed == null) {
|
||||
continue; // Due to minimal f show.
|
||||
}
|
||||
|
||||
parsed = TagUtil.parsePlaceholders(fme.getPlayer(), parsed);
|
||||
|
||||
if (TagUtil.hasFancy(parsed)) {
|
||||
List<FancyMessage> fancy = TagUtil.parseFancy(faction, fme, parsed);
|
||||
if (fancy != null) {
|
||||
|
@ -70,7 +70,6 @@ public abstract class MemoryFPlayer implements FPlayer {
|
||||
protected transient boolean loginPvpDisabled;
|
||||
protected transient long lastFrostwalkerMessage;
|
||||
|
||||
|
||||
public void login() {
|
||||
this.kills = getPlayer().getStatistic(Statistic.PLAYER_KILLS);
|
||||
this.deaths = getPlayer().getStatistic(Statistic.DEATHS);
|
||||
@ -305,7 +304,6 @@ public abstract class MemoryFPlayer implements FPlayer {
|
||||
return lastLoginTime;
|
||||
}
|
||||
|
||||
|
||||
public void setLastLoginTime(long lastLoginTime) {
|
||||
losePowerFromBeingOffline();
|
||||
this.lastLoginTime = lastLoginTime;
|
||||
@ -928,7 +926,7 @@ public abstract class MemoryFPlayer implements FPlayer {
|
||||
}
|
||||
|
||||
public void setMapHeight(int height) {
|
||||
this.mapHeight = height > Conf.mapHeight * 2 ? Conf.mapHeight * 2 : height;
|
||||
this.mapHeight = height > (Conf.mapHeight * 2) ? (Conf.mapHeight * 2) : height;
|
||||
}
|
||||
|
||||
public String getNameAndTitle(FPlayer fplayer) {
|
||||
|
@ -6,8 +6,10 @@ import com.massivecraft.factions.Faction;
|
||||
import com.massivecraft.factions.Factions;
|
||||
import com.massivecraft.factions.P;
|
||||
import com.massivecraft.factions.util.MiscUtil;
|
||||
import me.clip.placeholderapi.PlaceholderAPI;
|
||||
import mkremins.fanciful.FancyMessage;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -94,6 +96,18 @@ public class TagUtil {
|
||||
return null;
|
||||
}
|
||||
|
||||
public static String parsePlaceholders(Player player, String line) {
|
||||
if (P.p.isClipPlaceholderAPIHooked() && player.isOnline()) {
|
||||
line = PlaceholderAPI.setPlaceholders(player, line);
|
||||
}
|
||||
|
||||
if (P.p.isMVdWPlaceholderAPIHooked() && player.isOnline()) {
|
||||
line = be.maximvdw.placeholderapi.PlaceholderAPI.replacePlaceholders(player, line);
|
||||
}
|
||||
|
||||
return line;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if a line has fancy variables
|
||||
*
|
||||
|
@ -89,7 +89,7 @@ tooltips:
|
||||
- "&6Last Seen: &f{lastSeen}"
|
||||
- "&6Power: &f{power}"
|
||||
- "&6Rank: &f{group}"
|
||||
- "&6Balance: &a${player-balance}"
|
||||
- "&6Balance: &a${balance}"
|
||||
|
||||
# Configuration section for Scoreboards
|
||||
# This will allow you to completely customize how your scoreboards look.
|
||||
|
Loading…
Reference in New Issue
Block a user