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

Check for Carryall, RevealOnFire FrozenActor.Actor is null

Browse Source
This commit is contained in:
rob-v
2017-06-15 11:53:15 +02:00
committed by Paul Chote
parent 78bf530a4e
commit 7772ebedf4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Traits/Carryall.cs
View File

@@ -288,7 +288,7 @@ namespace OpenRA.Mods.Common.Traits
static bool CanTarget(Actor self, Actor target) static bool CanTarget(Actor self, Actor target)
{ {
if (!target.AppearsFriendlyTo(self)) if (target == null || !target.AppearsFriendlyTo(self))
return false; return false;
var carryable = target.TraitOrDefault<Carryable>(); var carryable = target.TraitOrDefault<Carryable>();

2
OpenRA.Mods.Common/Traits/RevealOnFire.cs
View File

@@ -68,7 +68,7 @@ namespace OpenRA.Mods.Common.Traits
{ {
if (target.Type == TargetType.Actor) if (target.Type == TargetType.Actor)
return target.Actor.Owner; return target.Actor.Owner;
else if (target.Type == TargetType.FrozenActor && !target.FrozenActor.Actor.IsDead) else if (target.Type == TargetType.FrozenActor && target.FrozenActor.Actor != null && !target.FrozenActor.Actor.IsDead)
return target.FrozenActor.Actor.Owner; return target.FrozenActor.Actor.Owner;
return null; return null;