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

Merge pull request #8253 from Mailaender/editor-resource-brush-nre

Browse Source 
Fixed a potential null reference exception during in-game editor resource placement
This commit is contained in:
Oliver Brakmann
2015-05-25 17:42:28 +02:00
parent 93d9398a64 dd5eca7d1d
commit 0d8876a1de
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/EditorBrushes/EditorResourceBrush.cs
View File

@@ -87,6 +87,9 @@ namespace OpenRA.Mods.Common.Widgets
var tile = world.Map.MapTiles.Value[cell]; var tile = world.Map.MapTiles.Value[cell];
var tileInfo = world.TileSet.GetTileInfo(tile); var tileInfo = world.TileSet.GetTileInfo(tile);
if (tileInfo == null)
return false;
var terrainType = world.TileSet.TerrainInfo[tileInfo.TerrainType]; var terrainType = world.TileSet.TerrainInfo[tileInfo.TerrainType];
if (world.Map.MapResources.Value[cell].Type == ResourceType.ResourceType) if (world.Map.MapResources.Value[cell].Type == ResourceType.ResourceType)