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

make portable chrono queueable

Browse Source 
give PortableChrono fallback movement

style fix

add chrono target line

require and cache IMove
This commit is contained in:
tovl
2019-01-27 18:13:55 +01:00
committed by abcdefg30
parent 71b61ad8ee
commit c096fbde96
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/Activities/Teleport.cs
View File

@@ -55,7 +55,7 @@ namespace OpenRA.Mods.Cnc.Activities
public override Activity Tick(Actor self)
{
var pc = self.TraitOrDefault<PortableChrono>();
if (teleporter == self && pc != null && !pc.CanTeleport)
if (teleporter == self && pc != null && (!pc.CanTeleport || IsCanceling))
{
if (killOnFailure)
self.Kill(teleporter, killDamageTypes);