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

Fix Mobile not sanitizing target location of Move orders

Browse Source
This commit is contained in:
Oliver Brakmann
2017-07-24 16:37:46 +02:00
committed by Paul Chote
parent 62a006ed3e
commit 8f26b4e92b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -626,7 +626,9 @@ namespace OpenRA.Mods.Common.Traits
{ {
if (order.OrderString == "Move") if (order.OrderString == "Move")
{ {
if (!Info.MoveIntoShroud && !self.Owner.Shroud.IsExplored(order.TargetLocation)) var loc = self.World.Map.Clamp(order.TargetLocation);
if (!Info.MoveIntoShroud && !self.Owner.Shroud.IsExplored(loc))
return; return;
if (!order.Queued) if (!order.Queued)
@@ -634,8 +636,8 @@ namespace OpenRA.Mods.Common.Traits
TicksBeforePathing = AverageTicksBeforePathing + self.World.SharedRandom.Next(-SpreadTicksBeforePathing, SpreadTicksBeforePathing); TicksBeforePathing = AverageTicksBeforePathing + self.World.SharedRandom.Next(-SpreadTicksBeforePathing, SpreadTicksBeforePathing);
self.SetTargetLine(Target.FromCell(self.World, order.TargetLocation), Color.Green); self.SetTargetLine(Target.FromCell(self.World, loc), Color.Green);
self.QueueActivity(order.Queued, new Move(self, order.TargetLocation, WDist.FromCells(8), null, true)); self.QueueActivity(order.Queued, new Move(self, loc, WDist.FromCells(8), null, true));
} }
if (order.OrderString == "Stop") if (order.OrderString == "Stop")