diff --git a/OpenRA.Mods.Common/Activities/FindAndDeliverResources.cs b/OpenRA.Mods.Common/Activities/FindAndDeliverResources.cs index 44f8e40a1b..3125eabcec 100644 --- a/OpenRA.Mods.Common/Activities/FindAndDeliverResources.cs +++ b/OpenRA.Mods.Common/Activities/FindAndDeliverResources.cs @@ -223,10 +223,10 @@ namespace OpenRA.Mods.Common.Activities CPos GetSearchFromLocation(Actor self) { - if (harv.LastLinkedProc != null) + if (harv.LastLinkedProc != null && !harv.LastLinkedProc.IsDead && harv.LastLinkedProc.IsInWorld) return harv.LastLinkedProc.Location + harv.LastLinkedProc.Trait().DeliveryOffset; - if (harv.LinkedProc != null) + if (harv.LinkedProc != null && !harv.LinkedProc.IsDead && harv.LinkedProc.IsInWorld) return harv.LinkedProc.Location + harv.LinkedProc.Trait().DeliveryOffset; return self.Location;