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

Scoreboards default to true and more player tags.

Browse Source
This commit is contained in:
drtshock 2015-06-08 02:01:21 -05:00
parent e7f8060441
commit 644e1ec8fb
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java
View File

@ -94,7 +94,7 @@ public abstract class MemoryFPlayer implements FPlayer {
protected transient boolean loginPvpDisabled; protected transient boolean loginPvpDisabled;
protected boolean spyingChat = false; protected boolean spyingChat = false;
protected boolean showScoreboard; protected boolean showScoreboard = true;
protected WarmUpUtil.Warmup warmup; protected WarmUpUtil.Warmup warmup;
protected int warmupTask; protected int warmupTask;
@ -267,7 +267,7 @@ public abstract class MemoryFPlayer implements FPlayer {
this.spyingChat = other.spyingChat; this.spyingChat = other.spyingChat;
this.lastStoodAt = other.lastStoodAt; this.lastStoodAt = other.lastStoodAt;
this.isAdminBypassing = other.isAdminBypassing; 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) { public void resetFactionData(boolean doSpoutUpdate) {

6
src/main/java/com/massivecraft/factions/zcore/util/TagReplacer.java
View File

@ -31,6 +31,8 @@ public enum TagReplacer {
PLAYER_GROUP(TagType.PLAYER, "{group}"), PLAYER_GROUP(TagType.PLAYER, "{group}"),
LAST_SEEN(TagType.PLAYER, "{lastSeen}"), LAST_SEEN(TagType.PLAYER, "{lastSeen}"),
PLAYER_BALANCE(TagType.PLAYER, "{balance}"), PLAYER_BALANCE(TagType.PLAYER, "{balance}"),
PLAYER_POWER(TagType.PLAYER, "{player-power}"),
PLAYER_MAXPOWER(TagType.PLAYER, "{player-maxpower}"),
/** /**
* Faction variables, require at least a player * Faction variables, require at least a player
@ -144,6 +146,10 @@ public enum TagReplacer {
return P.p.getPrimaryGroup(Bukkit.getOfflinePlayer(UUID.fromString(fp.getId()))); return P.p.getPrimaryGroup(Bukkit.getOfflinePlayer(UUID.fromString(fp.getId())));
case PLAYER_BALANCE: case PLAYER_BALANCE:
return Econ.isSetup() ? Econ.getFriendlyBalance(fp) : TL.ECON_OFF.format("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) { switch (this) {