Fix transport being blocked by its own passengers. #16313
Conversation
OpenRA.Mods.Common/Traits/Cargo.cs
Outdated
| @@ -214,7 +214,7 @@ public bool CanUnload() | |||
| } | |||
|
|
|||
| return !IsEmpty(self) && (aircraft == null || aircraft.CanLand(self.Location)) | |||
| && CurrentAdjacentCells != null && CurrentAdjacentCells.Any(c => Passengers.Any(p => p.Trait<IPositionable>().CanEnterCell(c))); | |||
| && CurrentAdjacentCells != null && CurrentAdjacentCells.Any(c => Passengers.Any(p => p.Trait<IPositionable>().CanEnterCell(c, null, false))); | |||
There was a problem hiding this comment.
This will return the wrong result for cases like EjectOnDeath: true that need to know if it can unload an actor right now, without waiting for transient actors to move. This will lead to units being stacked on top of eachother in the same (sub)cell.
Adding a checkTransient or immediate or similar flag to CanUnload to distinguish these cases should help.
There was a problem hiding this comment.
It turns out that pretty much everything else in the EjectOnDeath code is bogus, and so this issue already exists on bleed, and still exists after the changes here - see #16353 for details.
I can confirm that the change here does work after hacking around the other issues, which we shouldn't be trying to fix in this PR.
When determining whether it can unload its cargo, a transport craft will now ignore transient actors. This prevents the
UnloadCargoaction aborting early due to some of its own passengers blocking the exits. This regression was introduced by #16060.Fixes #16307 .