From 9886f0ca9a3811305346fd42efe13c3053e7b712 Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Sun, 26 Jul 2020 18:35:21 +0100
Subject: [PATCH] Fix Harvester crash when multiple resource renderers are
 used.

---
 OpenRA.Mods.Common/Traits/Harvester.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/OpenRA.Mods.Common/Traits/Harvester.cs b/OpenRA.Mods.Common/Traits/Harvester.cs
index efabed61c7..5d0d68f64a 100644
--- a/OpenRA.Mods.Common/Traits/Harvester.cs
+++ b/OpenRA.Mods.Common/Traits/Harvester.cs
@@ -380,10 +380,12 @@ namespace OpenRA.Mods.Common.Traits
 				if (!self.Owner.Shroud.IsExplored(location))
 					return false;
 
-				var res = self.World.WorldActor.Trait<ResourceRenderer>().GetRenderedResourceType(location);
 				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;
 
 				cursor = "harvest";