diff --git a/OpenRA.Mods.Cnc/Missions/Nod01Script.cs b/OpenRA.Mods.Cnc/Missions/Nod01Script.cs index 27b754bc1d..86f3e7b6e7 100644 --- a/OpenRA.Mods.Cnc/Missions/Nod01Script.cs +++ b/OpenRA.Mods.Cnc/Missions/Nod01Script.cs @@ -38,7 +38,6 @@ namespace OpenRA.Mods.Cnc.Missions const string KillNikoombaText = "Find Nikoomba. Once found he must be assasinated."; const string LevelVillageText = "Nikoomba has met his demise, now level the village."; - Player gdi; Player nod; Actor nikoomba; @@ -121,9 +120,9 @@ namespace OpenRA.Mods.Cnc.Missions MissionAccomplished("Nikoomba was killed and the village was destroyed."); //does an fmv play at this point? } - } - - if (!world.Actors.Any(a => (a.Owner == nod))) + } + + if (!world.Actors.Any(a => (a.Owner == nod) && a.IsInWorld && !a.IsDead())) { Action afterFMV = () => { @@ -163,7 +162,6 @@ namespace OpenRA.Mods.Cnc.Missions public void WorldLoaded(World w) { world = w; - gdi = w.Players.Single(p => p.InternalName == "GDI"); nod = w.Players.Single(p => p.InternalName == "NOD"); nod.PlayerActor.Trait().Cash = 0; var actors = w.WorldActor.Trait().Actors;