diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java index ec27c941..2fb16471 100644 --- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java +++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java @@ -94,7 +94,7 @@ public abstract class MemoryFPlayer implements FPlayer { protected transient boolean loginPvpDisabled; protected boolean spyingChat = false; - protected boolean showScoreboard; + protected boolean showScoreboard = true; protected WarmUpUtil.Warmup warmup; protected int warmupTask; @@ -267,7 +267,7 @@ public abstract class MemoryFPlayer implements FPlayer { this.spyingChat = other.spyingChat; this.lastStoodAt = other.lastStoodAt; this.isAdminBypassing = other.isAdminBypassing; - this.showScoreboard = P.p.getConfig().getBoolean("scoreboard.default-enabled", false); + this.showScoreboard = P.p.getConfig().getBoolean("scoreboard.default-enabled", true); } public void resetFactionData(boolean doSpoutUpdate) { diff --git a/src/main/java/com/massivecraft/factions/zcore/util/TagReplacer.java b/src/main/java/com/massivecraft/factions/zcore/util/TagReplacer.java index 6f6d2d5e..0c18c8f0 100644 --- a/src/main/java/com/massivecraft/factions/zcore/util/TagReplacer.java +++ b/src/main/java/com/massivecraft/factions/zcore/util/TagReplacer.java @@ -31,6 +31,8 @@ public enum TagReplacer { PLAYER_GROUP(TagType.PLAYER, "{group}"), LAST_SEEN(TagType.PLAYER, "{lastSeen}"), PLAYER_BALANCE(TagType.PLAYER, "{balance}"), + PLAYER_POWER(TagType.PLAYER, "{player-power}"), + PLAYER_MAXPOWER(TagType.PLAYER, "{player-maxpower}"), /** * Faction variables, require at least a player @@ -144,6 +146,10 @@ public enum TagReplacer { return P.p.getPrimaryGroup(Bukkit.getOfflinePlayer(UUID.fromString(fp.getId()))); case PLAYER_BALANCE: return Econ.isSetup() ? Econ.getFriendlyBalance(fp) : TL.ECON_OFF.format("balance"); + case PLAYER_POWER: + return String.valueOf(fp.getPowerRounded()); + case PLAYER_MAXPOWER: + return String.valueOf(fp.getPowerMaxRounded()); } } switch (this) {