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

Fix Harvester crash when multiple resource renderers are used.

Browse Source
This commit is contained in:
Paul Chote
2020-07-26 18:35:21 +01:00
committed by teinarss
parent 46cf56d6ff
commit 9886f0ca9a
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/Harvester.cs
View File

@@ -380,10 +380,12 @@ namespace OpenRA.Mods.Common.Traits
if (!self.Owner.Shroud.IsExplored(location)) if (!self.Owner.Shroud.IsExplored(location))
return false; return false;
var res = self.World.WorldActor.Trait<ResourceRenderer>().GetRenderedResourceType(location);
var info = self.Info.TraitInfo<HarvesterInfo>(); var info = self.Info.TraitInfo<HarvesterInfo>();
var res = self.World.WorldActor.TraitsImplementing<ResourceRenderer>()
.Select(r => r.GetRenderedResourceType(location))
.FirstOrDefault(r => r != null && info.Resources.Contains(r.Info.Type));
if (res == null || !info.Resources.Contains(res.Info.Type)) if (res == null)
return false; return false;
cursor = "harvest"; cursor = "harvest";