quick hack around the teamchat crash in lobby

2010-10-12 21:19:27 +13:00
parent 6b6c9639f9
commit 7c31f72db6
1 changed files with 11 additions and 8 deletions
--- a/OpenRA.Game/Network/UnitOrders.cs
+++ b/OpenRA.Game/Network/UnitOrders.cs
@@ -46,6 +46,8 @@ namespace OpenRA.Network
 				{
 					var client = orderManager.LobbyInfo.ClientWithIndex(clientId);
 					if (client != null)
+					{
+						if (world != null)		// TODO: fix this whole thing properly. this is BS.
 						{
 							var player = world.FindPlayerByClientId(clientId);
 							var display = player != null
@@ -58,6 +60,7 @@ namespace OpenRA.Network
 								Game.AddChatLine(client.Color1, client.Name + suffix, order.TargetString);
 							}
 						}
+					}
 					break;
 				}
 			case "StartGame":