epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix team chat messages not always being displayed

Browse Source
This commit is contained in:
abcdefg30
2019-11-24 21:21:59 +01:00
committed by teinarss
parent 82be8d9990
commit 2918ecadaa
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Game/Network/UnitOrders.cs
View File

@@ -88,14 +88,12 @@ namespace OpenRA.Network
break; break;
} }
if (orderManager.LocalClient == null)
break;
var player = world.FindPlayerByClient(client); var player = world.FindPlayerByClient(client);
var localClientIsObserver = orderManager.LocalClient.IsObserver || (world.LocalPlayer != null && world.LocalPlayer.WinState != WinState.Undefined); var localClientIsObserver = world.IsReplay || (orderManager.LocalClient != null && orderManager.LocalClient.IsObserver)
|| (world.LocalPlayer != null && world.LocalPlayer.WinState != WinState.Undefined);
// ExtraData gives us the team number, uint.MaxValue means Spectators // ExtraData gives us the team number, uint.MaxValue means Spectators
if (order.ExtraData == uint.MaxValue && (localClientIsObserver || world.IsReplay)) if (order.ExtraData == uint.MaxValue && localClientIsObserver)
{ {
// Validate before adding the line // Validate before adding the line
if (client.IsObserver || (player != null && player.WinState != WinState.Undefined)) if (client.IsObserver || (player != null && player.WinState != WinState.Undefined))
@@ -105,8 +103,8 @@ namespace OpenRA.Network
} }
var valid = client.Team == order.ExtraData && player != null && player.WinState == WinState.Undefined; var valid = client.Team == order.ExtraData && player != null && player.WinState == WinState.Undefined;
var isSameTeam = order.ExtraData == orderManager.LocalClient.Team && world.LocalPlayer != null var isSameTeam = orderManager.LocalClient != null && order.ExtraData == orderManager.LocalClient.Team
&& world.LocalPlayer.WinState == WinState.Undefined; && world.LocalPlayer != null && world.LocalPlayer.WinState == WinState.Undefined;
if (valid && (isSameTeam || world.IsReplay)) if (valid && (isSameTeam || world.IsReplay))
Game.AddChatLine("[Team" + (world.IsReplay ? " " + order.ExtraData : "") + "] " + client.Name, client.Color, message); Game.AddChatLine("[Team" + (world.IsReplay ? " " + order.ExtraData : "") + "] " + client.Name, client.Color, message);