From 767de564fc29fa4fb1adec99e52c26a5076033b8 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sat, 13 Apr 2019 15:34:04 +0200 Subject: [PATCH] Use Team numbers instead of stances --- OpenRA.Game/Network/UnitOrders.cs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/OpenRA.Game/Network/UnitOrders.cs b/OpenRA.Game/Network/UnitOrders.cs index 1e4d1e4657..12deefd4e7 100644 --- a/OpenRA.Game/Network/UnitOrders.cs +++ b/OpenRA.Game/Network/UnitOrders.cs @@ -97,11 +97,17 @@ namespace OpenRA.Network break; } - var player = world.FindPlayerByClient(client); - if ((player != null && world.LocalPlayer != null && player.Stances[world.LocalPlayer] == Stance.Ally) || (world.IsReplay && player != null)) - Game.AddChatLine(client.Color, "[Team" + (world.IsReplay ? " " + client.Team : "") + "] " + client.Name, message); - else if ((orderManager.LocalClient != null && orderManager.LocalClient.IsObserver && client.IsObserver) || (world.IsReplay && client.IsObserver)) + if (orderManager.LocalClient == null) + break; + + if (client.IsObserver && (orderManager.LocalClient.IsObserver || world.IsReplay)) + { Game.AddChatLine(client.Color, "[Spectators] " + client.Name, message); + break; + } + + if (client.Team == orderManager.LocalClient.Team || world.IsReplay) + Game.AddChatLine(client.Color, "[Team" + (world.IsReplay ? " " + client.Team : "") + "] " + client.Name, message); break; }