From 4dec1fe43061d6847a773287bc26fe44cbd53b80 Mon Sep 17 00:00:00 2001 From: dnqbob Date: Sat, 19 Aug 2023 15:59:05 +0800 Subject: [PATCH] Autocarryall put down unit if destination is cancelled when picking up --- OpenRA.Mods.Common/Traits/AutoCarryall.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/AutoCarryall.cs b/OpenRA.Mods.Common/Traits/AutoCarryall.cs index 39a7a182e0..8bcc3cd0cd 100644 --- a/OpenRA.Mods.Common/Traits/AutoCarryall.cs +++ b/OpenRA.Mods.Common/Traits/AutoCarryall.cs @@ -128,10 +128,7 @@ namespace OpenRA.Mods.Common.Traits return true; var dropRange = carryall.Info.DropRange; - var destination = carryable.Destination; - if (destination != null) - self.QueueActivity(true, new DeliverUnit(self, Target.FromCell(self.World, destination.Value), dropRange, carryall.Info.TargetLineColor)); - + self.QueueActivity(true, new DeliverUnit(self, Target.FromCell(self.World, carryable.Destination ?? self.Location), dropRange, carryall.Info.TargetLineColor)); return true; } }