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

Remove ResolveFrozenActorOrder from EntersTunnels.

Browse Source
This commit is contained in:
Paul Chote
2019-01-22 22:33:47 +00:00
committed by Oliver Brakmann
parent 240c2243f2
commit 6ed2654038
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Traits/EntersTunnels.cs
View File

@@ -62,15 +62,11 @@ namespace OpenRA.Mods.Common.Traits
public void ResolveOrder(Actor self, Order order)
{
if (order.OrderString != "EnterTunnel")
if (order.OrderString != "EnterTunnel" || order.Target.Type != TargetType.Actor)
return;
var target = self.ResolveFrozenActorOrder(order, Color.Red);
if (target.Type != TargetType.Actor)
return;
var tunnel = target.Actor.TraitOrDefault<TunnelEntrance>();
if (!tunnel.Exit.HasValue)
var tunnel = order.Target.Actor.TraitOrDefault<TunnelEntrance>();
if (tunnel == null || !tunnel.Exit.HasValue)
return;
if (!order.Queued)