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

Fix potential crash if attempted to unload outside of the map

Browse Source
This commit is contained in:
Gustas
2023-08-20 23:13:17 +03:00
committed by Matthias Mailänder
parent 6040187844
commit 90aeb38427
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Cargo.cs
View File

@@ -241,9 +241,10 @@ namespace OpenRA.Mods.Common.Traits
if (checkTerrainType) if (checkTerrainType)
{ {
var terrainType = self.World.Map.GetTerrainInfo(self.Location).Type; if (!self.World.Map.Contains(self.Location))
return false;
if (!Info.UnloadTerrainTypes.Contains(terrainType)) if (!Info.UnloadTerrainTypes.Contains(self.World.Map.GetTerrainInfo(self.Location).Type))
return false; return false;
} }
@@ -409,6 +410,7 @@ namespace OpenRA.Mods.Common.Traits
void INotifyKilled.Killed(Actor self, AttackInfo e) void INotifyKilled.Killed(Actor self, AttackInfo e)
{ {
// IsAtGroundLevel contains Map.Contains(self.Location) check.
if (Info.EjectOnDeath && self.IsAtGroundLevel() && (!checkTerrainType || Info.UnloadTerrainTypes.Contains(self.World.Map.GetTerrainInfo(self.Location).Type))) if (Info.EjectOnDeath && self.IsAtGroundLevel() && (!checkTerrainType || Info.UnloadTerrainTypes.Contains(self.World.Map.GetTerrainInfo(self.Location).Type)))
{ {
while (!IsEmpty()) while (!IsEmpty())