From ffe36334a001b2ac1658f4c7778621e42e394c17 Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Mon, 4 Jul 2016 14:51:01 +0200 Subject: [PATCH] Fix loading wrong transport when using alternate EnterTransport method --- OpenRA.Mods.Common/Activities/EnterTransport.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.Common/Activities/EnterTransport.cs b/OpenRA.Mods.Common/Activities/EnterTransport.cs index 6c76e2d673..76d06a44e3 100644 --- a/OpenRA.Mods.Common/Activities/EnterTransport.cs +++ b/OpenRA.Mods.Common/Activities/EnterTransport.cs @@ -17,9 +17,9 @@ namespace OpenRA.Mods.Common.Activities { class EnterTransport : Enter { - readonly Actor transport; readonly Passenger passenger; readonly int maxTries; + Actor transport; Cargo cargo; public EnterTransport(Actor self, Actor transport, int maxTries = 0, bool targetCenter = false) @@ -64,7 +64,7 @@ namespace OpenRA.Mods.Common.Activities var type = target.Actor.Info.Name; return TryGetAlternateTargetInCircle( self, passenger.Info.AlternateTransportScanRange, - t => cargo = t.Actor.Trait(), // update cargo + t => { transport = t.Actor; cargo = t.Actor.Trait(); }, // update transport and cargo a => { var c = a.TraitOrDefault(); return c != null && (c.Unloading || c.CanLoad(a, self)); }, new Func[] { a => a.Info.Name == type }); // Prefer transports of the same type }