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

Fix a crash in Disguise.cs when order.TargetActor is null

Browse Source
This commit is contained in:
abcdefg30
2017-11-19 02:30:45 +01:00
committed by reaperrr
parent c83dda4ce7
commit ed67cea852
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Cnc/Traits/Disguise.cs
View File

@@ -151,8 +151,12 @@ namespace OpenRA.Mods.Cnc.Traits
{ {
if (order.OrderString == "Disguise") if (order.OrderString == "Disguise")
{ {
var target = order.TargetActor != self && order.TargetActor.IsInWorld ? order.TargetActor : null; var target = order.Target;
DisguiseAs(target); if (target.Type == TargetType.Actor)
DisguiseAs((target.Actor != self && target.Actor.IsInWorld) ? target.Actor : null);
if (target.Type == TargetType.FrozenActor)
DisguiseAs(target.FrozenActor.Info, target.FrozenActor.Owner);
} }
} }