From af0efda6f5061f2f954c13e68de850f841d8b444 Mon Sep 17 00:00:00 2001 From: Alexander Fast Date: Sat, 23 Aug 2014 21:18:54 +0200 Subject: [PATCH] Changes how the playerNames collection is created. It's now extracted from the orderManager, like it's done in LobbyLogic. This is to increase consistency. --- OpenRA.Mods.RA/Widgets/Logic/IngameChatLogic.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.RA/Widgets/Logic/IngameChatLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/IngameChatLogic.cs index 018b4ca69a..f9ba129837 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/IngameChatLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/IngameChatLogic.cs @@ -43,12 +43,12 @@ namespace OpenRA.Mods.RA.Widgets.Logic chatTraits = world.WorldActor.TraitsImplementing().ToList(); - var players = world.Players.Where(p => p != world.LocalPlayer && !p.NonCombatant && !p.IsBot).ToList(); + var players = world.Players.Where(p => p != world.LocalPlayer && !p.NonCombatant && !p.IsBot); var disableTeamChat = world.LocalPlayer == null || world.LobbyInfo.IsSinglePlayer || !players.Any(p => p.IsAlliedWith(world.LocalPlayer)); teamChat = !disableTeamChat; commandNames = chatTraits.OfType().SelectMany(x => x.Commands.Keys).Select(x => "/" + x).ToList(); - playerNames = players.Select(x => x.PlayerName).ToList(); + playerNames = orderManager.LobbyInfo.Clients.Select(c => c.Name).ToList(); var chatPanel = (ContainerWidget)widget; chatOverlay = chatPanel.Get("CHAT_OVERLAY");