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

Validate order targets when resolving orders.

Browse Source
This commit is contained in:
RoosterDragon
2023-07-20 18:36:40 +01:00
committed by Gustas
parent c08ddb61b3
commit 2ac855488b
8 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -1065,6 +1065,9 @@ namespace OpenRA.Mods.Common.Traits
var orderString = order.OrderString; var orderString = order.OrderString;
if (orderString == "Move") if (orderString == "Move")
{ {
if (!order.Target.IsValidFor(self))
return;
var cell = self.World.Map.Clamp(self.World.Map.CellContaining(order.Target.CenterPosition)); var cell = self.World.Map.Clamp(self.World.Map.CellContaining(order.Target.CenterPosition));
if (!Info.MoveIntoShroud && !self.Owner.Shroud.IsExplored(cell)) if (!Info.MoveIntoShroud && !self.Owner.Shroud.IsExplored(cell))
return; return;
@@ -1080,6 +1083,9 @@ namespace OpenRA.Mods.Common.Traits
} }
else if (orderString == "Land") else if (orderString == "Land")
{ {
if (!order.Target.IsValidFor(self))
return;
var cell = self.World.Map.Clamp(self.World.Map.CellContaining(order.Target.CenterPosition)); var cell = self.World.Map.Clamp(self.World.Map.CellContaining(order.Target.CenterPosition));
if (!Info.MoveIntoShroud && !self.Owner.Shroud.IsExplored(cell)) if (!Info.MoveIntoShroud && !self.Owner.Shroud.IsExplored(cell))
return; return;

3
OpenRA.Mods.Common/Traits/AttackMove.cs
View File

@@ -83,6 +83,9 @@ namespace OpenRA.Mods.Common.Traits
{ {
if (order.OrderString == "AttackMove" || order.OrderString == "AssaultMove") if (order.OrderString == "AttackMove" || order.OrderString == "AssaultMove")
{ {
if (!order.Target.IsValidFor(self))
return;
var cell = self.World.Map.Clamp(self.World.Map.CellContaining(order.Target.CenterPosition)); var cell = self.World.Map.Clamp(self.World.Map.CellContaining(order.Target.CenterPosition));
if (!Info.MoveIntoShroud && !self.Owner.Shroud.IsExplored(cell)) if (!Info.MoveIntoShroud && !self.Owner.Shroud.IsExplored(cell))
return; return;

3
OpenRA.Mods.Common/Traits/Buildings/RallyPoint.cs
View File

@@ -128,6 +128,9 @@ namespace OpenRA.Mods.Common.Traits
if (order.OrderString != OrderID) if (order.OrderString != OrderID)
return; return;
if (!order.Target.IsValidFor(self))
return;
if (!order.Queued) if (!order.Queued)
Path.Clear(); Path.Clear();

3
OpenRA.Mods.Common/Traits/Buildings/TransformsIntoAircraft.cs
View File

@@ -121,6 +121,9 @@ namespace OpenRA.Mods.Common.Traits
if (order.OrderString == "Move") if (order.OrderString == "Move")
{ {
if (!order.Target.IsValidFor(self))
return;
var cell = self.World.Map.Clamp(self.World.Map.CellContaining(order.Target.CenterPosition)); var cell = self.World.Map.Clamp(self.World.Map.CellContaining(order.Target.CenterPosition));
if (!Info.MoveIntoShroud && !self.Owner.Shroud.IsExplored(cell)) if (!Info.MoveIntoShroud && !self.Owner.Shroud.IsExplored(cell))
return; return;

3
OpenRA.Mods.Common/Traits/Buildings/TransformsIntoMobile.cs
View File

@@ -112,6 +112,9 @@ namespace OpenRA.Mods.Common.Traits
if (order.OrderString == "Move") if (order.OrderString == "Move")
{ {
if (!order.Target.IsValidFor(self))
return;
var cell = self.World.Map.Clamp(this.self.World.Map.CellContaining(order.Target.CenterPosition)); var cell = self.World.Map.Clamp(this.self.World.Map.CellContaining(order.Target.CenterPosition));
if (!Info.LocomotorInfo.MoveIntoShroud && !self.Owner.Shroud.IsExplored(cell)) if (!Info.LocomotorInfo.MoveIntoShroud && !self.Owner.Shroud.IsExplored(cell))
return; return;

3
OpenRA.Mods.Common/Traits/Carryall.cs
View File

@@ -348,6 +348,9 @@ namespace OpenRA.Mods.Common.Traits
{ {
if (order.OrderString == "DeliverUnit") if (order.OrderString == "DeliverUnit")
{ {
if (!order.Target.IsValidFor(self))
return;
var cell = self.World.Map.Clamp(self.World.Map.CellContaining(order.Target.CenterPosition)); var cell = self.World.Map.Clamp(self.World.Map.CellContaining(order.Target.CenterPosition));
if (!aircraftInfo.MoveIntoShroud && !self.Owner.Shroud.IsExplored(cell)) if (!aircraftInfo.MoveIntoShroud && !self.Owner.Shroud.IsExplored(cell))
return; return;

3
OpenRA.Mods.Common/Traits/Minelayer.cs
View File

@@ -143,6 +143,9 @@ namespace OpenRA.Mods.Common.Traits
if (order.OrderString != "BeginMinefield" && order.OrderString != "PlaceMinefield" && order.OrderString != "PlaceMine") if (order.OrderString != "BeginMinefield" && order.OrderString != "PlaceMinefield" && order.OrderString != "PlaceMine")
return; return;
if (!order.Target.IsValidFor(self))
return;
var cell = self.World.Map.CellContaining(order.Target.CenterPosition); var cell = self.World.Map.CellContaining(order.Target.CenterPosition);
if (order.OrderString == "BeginMinefield") if (order.OrderString == "BeginMinefield")
minefieldStart = cell; minefieldStart = cell;

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

@@ -922,6 +922,9 @@ namespace OpenRA.Mods.Common.Traits
if (order.OrderString == "Move") if (order.OrderString == "Move")
{ {
if (!order.Target.IsValidFor(self))
return;
var cell = self.World.Map.Clamp(this.self.World.Map.CellContaining(order.Target.CenterPosition)); var cell = self.World.Map.Clamp(this.self.World.Map.CellContaining(order.Target.CenterPosition));
if (!Info.LocomotorInfo.MoveIntoShroud && !self.Owner.Shroud.IsExplored(cell)) if (!Info.LocomotorInfo.MoveIntoShroud && !self.Owner.Shroud.IsExplored(cell))
return; return;