Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

This commit is contained in:
Jonathan Williams 2014-08-07 21:22:28 -05:00
commit 57cf3e4da6

View File

@ -173,12 +173,16 @@ public class GameLobbyManager implements IPacketRunnable, Listener
}
}
}
if (resendToAll)
{
for (Player otherPlayer : UtilServer.getPlayers())
{
AddPlayerToScoreboards(otherPlayer, null);
String teamName = null;
if (Manager.GetGame() != null && Manager.GetGame().GetTeam(otherPlayer) != null)
teamName = Manager.GetGame().GetTeam(otherPlayer).GetName().toUpperCase();
AddPlayerToScoreboards(otherPlayer, teamName);
}
}
}
@ -1085,7 +1089,7 @@ public class GameLobbyManager implements IPacketRunnable, Listener
}
teamName = rankName + teamName;
for (Scoreboard scoreboard : GetScoreboards())
{
try