From 917c442b59fbaeb0f2a31808df7b151c4b8e7886 Mon Sep 17 00:00:00 2001 From: eueln Date: Fri, 7 Nov 2014 13:13:54 -0600 Subject: [PATCH] Correct implementation of FTeamWrapper::updatePrefix --- .../factions/scoreboards/FTeamWrapper.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/scoreboards/FTeamWrapper.java b/src/main/java/com/massivecraft/factions/scoreboards/FTeamWrapper.java index 9e1fcec3..e55ed8e0 100644 --- a/src/main/java/com/massivecraft/factions/scoreboards/FTeamWrapper.java +++ b/src/main/java/com/massivecraft/factions/scoreboards/FTeamWrapper.java @@ -139,17 +139,14 @@ public class FTeamWrapper { private void updatePrefix(FScoreboard fboard) { if (P.p.getConfig().getBoolean("scoreboard.default-prefixes", false)) { + FPlayer fplayer = fboard.getFPlayer(); + Team team = teams.get(fboard); - for (Map.Entry entry : teams.entrySet()) { - FPlayer fplayer = entry.getKey().getFPlayer(); - Team team = entry.getValue(); - - String prefix = TL.DEFAULT_PREFIX.toString(); - 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); - } + String prefix = TL.DEFAULT_PREFIX.toString(); + 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); } } }