Fix Cargo>EjectOnDeath crash with multipile INotifyBlockingMove

This commit is contained in:
Mustafa Alperen Seki
2018-08-13 09:40:27 +03:00
committed by abcdefg30
parent c983dda077
commit 1977e64e07

View File

@@ -384,8 +384,8 @@ namespace OpenRA.Mods.Common.Traits
if (!inAir && positionable.CanEnterCell(self.Location, self, false)) if (!inAir && positionable.CanEnterCell(self.Location, self, false))
{ {
self.World.AddFrameEndTask(w => w.Add(passenger)); self.World.AddFrameEndTask(w => w.Add(passenger));
var nbm = passenger.TraitOrDefault<INotifyBlockingMove>(); var nbms = passenger.TraitsImplementing<INotifyBlockingMove>();
if (nbm != null) foreach (var nbm in nbms)
nbm.OnNotifyBlockingMove(passenger, passenger); nbm.OnNotifyBlockingMove(passenger, passenger);
} }
else else