From 959d3f8bd7eb9f1dcfe6a77d52a4aaf7d4a9ebc3 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sat, 25 Sep 2010 07:34:51 +1200
Subject: [PATCH] fix crash in giving a harv DeliverOre order after its proc
 has died, but it hasnt noticed yet

---
 OpenRA.Mods.RA/Harvester.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenRA.Mods.RA/Harvester.cs b/OpenRA.Mods.RA/Harvester.cs
index afe5580811..67f171b029 100644
--- a/OpenRA.Mods.RA/Harvester.cs
+++ b/OpenRA.Mods.RA/Harvester.cs
@@ -153,7 +153,7 @@ namespace OpenRA.Mods.RA
 			{
 				if (order.TargetActor != LinkedProc)
 				{
-					if (LinkedProc != null)
+					if (LinkedProc != null && LinkedProc.IsInWorld)
 						LinkedProc.TraitsImplementing<IAcceptOre>().FirstOrDefault().UnlinkHarvester(LinkedProc,self);
 					LinkedProc = order.TargetActor;
 					LinkedProc.TraitsImplementing<IAcceptOre>().FirstOrDefault().LinkHarvester(LinkedProc,self);