Correct implementation of FTeamWrapper::updatePrefix

This commit is contained in:
eueln 2014-11-07 13:13:54 -06:00
parent 29836a9183
commit 917c442b59

View File

@ -139,17 +139,14 @@ public class FTeamWrapper {
private void updatePrefix(FScoreboard fboard) { private void updatePrefix(FScoreboard fboard) {
if (P.p.getConfig().getBoolean("scoreboard.default-prefixes", false)) { if (P.p.getConfig().getBoolean("scoreboard.default-prefixes", false)) {
FPlayer fplayer = fboard.getFPlayer();
Team team = teams.get(fboard);
for (Map.Entry<FScoreboard, Team> entry : teams.entrySet()) { String prefix = TL.DEFAULT_PREFIX.toString();
FPlayer fplayer = entry.getKey().getFPlayer(); prefix = prefix.replace("{relationcolor}", faction.getRelationTo(fplayer).getColor().toString());
Team team = entry.getValue(); prefix = prefix.replace("{faction}", faction.getTag().substring(0, Math.min("{faction}".length() + 16 - prefix.length(), faction.getTag().length())));
if (team.getPrefix() == null || !team.getPrefix().equals(prefix)) {
String prefix = TL.DEFAULT_PREFIX.toString(); team.setPrefix(prefix);
prefix = prefix.replace("{relationcolor}", faction.getRelationTo(fplayer).getColor().toString());
prefix = prefix.replace("{faction}", faction.getTag().substring(0, Math.min("{faction}".length() + 16 - prefix.length(), faction.getTag().length())));
if (team.getPrefix() == null || !team.getPrefix().equals(prefix)) {
team.setPrefix(prefix);
}
} }
} }
} }