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

Merge pull request #8701 from obrakmann/fix8591_bldg-placement-nre

Browse Source 
Fix an NRE during building placement under rare circumstances
This commit is contained in:
abcdefg30
2015-07-13 14:24:53 +02:00
parent db4f1ad025 dd89aa1d48
commit 4297d06ba3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs
View File

@@ -49,7 +49,8 @@ namespace OpenRA.Mods.Common.Orders
buildingInfo = info.Traits.Get<BuildingInfo>();
var buildableInfo = info.Traits.Get<BuildableInfo>();
race = buildableInfo.ForceRace ?? queue.MostLikelyProducer().Trait.Race;
var mostLikelyProducer = queue.MostLikelyProducer();
race = buildableInfo.ForceRace ?? (mostLikelyProducer.Trait != null ? mostLikelyProducer.Trait.Race : producer.Owner.Country.Race);
buildOk = map.SequenceProvider.GetSequence("overlay", "build-valid-{0}".F(tileset)).GetSprite(0);
buildBlocked = map.SequenceProvider.GetSequence("overlay", "build-invalid").GetSprite(0);