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

Fix Chrono Tanks telesporting towards (0,0) when force-moving to an actor.

Browse Source
This commit is contained in:
Paul Chote
2017-12-31 10:48:19 +00:00
committed by abcdefg30
parent 2f6bbd906b
commit e70b61c4b0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Cnc/Traits/PortableChrono.cs
View File

@@ -95,11 +95,13 @@ namespace OpenRA.Mods.Cnc.Traits
public void ResolveOrder(Actor self, Order order) public void ResolveOrder(Actor self, Order order)
{ {
if (order.OrderString == "PortableChronoTeleport" && CanTeleport) if (order.OrderString == "PortableChronoTeleport" && CanTeleport && order.Target.Type != TargetType.Invalid)
{ {
var maxDistance = Info.HasDistanceLimit ? Info.MaxDistance : (int?)null; var maxDistance = Info.HasDistanceLimit ? Info.MaxDistance : (int?)null;
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new Teleport(self, order.TargetLocation, maxDistance, Info.KillCargo, Info.FlashScreen, Info.ChronoshiftSound));
var cell = self.World.Map.CellContaining(order.Target.CenterPosition);
self.QueueActivity(new Teleport(self, cell, maxDistance, Info.KillCargo, Info.FlashScreen, Info.ChronoshiftSound));
} }
} }