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

Merge pull request #9720 from penev92/fixUtility

Browse Source 
Fix a crash in CheckPlayers when an actor doesn't define an Owner
This commit is contained in:
atlimit8
2015-10-25 12:41:50 -05:00
parent e0dffe773c 0487ec0d08
commit 10aca92bef
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Lint/CheckPlayers.cs
View File

@@ -59,10 +59,18 @@ namespace OpenRA.Mods.Common.Lint
foreach (var kv in map.ActorDefinitions) foreach (var kv in map.ActorDefinitions)
{ {
var actorReference = new ActorReference(kv.Value.Value, kv.Value.ToDictionary()); var actorReference = new ActorReference(kv.Value.Value, kv.Value.ToDictionary());
var ownerName = actorReference.InitDict.Get<OwnerInit>().PlayerName; var ownerInit = actorReference.InitDict.GetOrDefault<OwnerInit>();
if (ownerInit == null)
{
emitError("Actor {0} is not owned by any player.".F(kv.Key));
}
else
{
var ownerName = ownerInit.PlayerName;
if (!playerNames.Contains(ownerName)) if (!playerNames.Contains(ownerName))
emitError("Actor {0} is owned by unknown player {1}.".F(actorReference.Type, ownerName)); emitError("Actor {0} is owned by unknown player {1}.".F(actorReference.Type, ownerName));
} }
} }
} }
}
} }