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

Don't crash when the bullet bounces outside of the map.

Browse Source
This commit is contained in:
Matthias Mailänder
2020-11-03 14:08:37 +01:00
committed by reaperrr
parent 0320dcdef9
commit b4670345dd
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Projectiles/Bullet.cs
View File

@@ -235,8 +235,11 @@ namespace OpenRA.Mods.Common.Projectiles
if (flightLengthReached && shouldBounce) if (flightLengthReached && shouldBounce)
{ {
var terrainPos = world.Map.CellContaining(pos); var cell = world.Map.CellContaining(pos);
if (info.InvalidBounceTerrain.Contains(world.Map.GetTerrainInfo(terrainPos).Type)) if (!world.Map.Contains(cell))
return true;
if (info.InvalidBounceTerrain.Contains(world.Map.GetTerrainInfo(cell).Type))
return true; return true;
if (AnyValidTargetsInRadius(world, pos, info.Width, args.SourceActor, true)) if (AnyValidTargetsInRadius(world, pos, info.Width, args.SourceActor, true))