From a909a3e692ca45aa4ba00e0899b82bd4c2eb81c4 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sun, 13 Oct 2019 22:36:29 +0200 Subject: [PATCH] Ignore self and actors not at ground level in Parachutable.OnLanded --- OpenRA.Mods.Common/Traits/Parachutable.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Parachutable.cs b/OpenRA.Mods.Common/Traits/Parachutable.cs index 0a103b556e..fa7611a525 100644 --- a/OpenRA.Mods.Common/Traits/Parachutable.cs +++ b/OpenRA.Mods.Common/Traits/Parachutable.cs @@ -102,11 +102,11 @@ namespace OpenRA.Mods.Common.Traits if (positionable.CanEnterCell(cell, self)) return; - if (IgnoreActor != null && !self.World.ActorMap.GetActorsAt(cell).Any(a => a != IgnoreActor)) + if (IgnoreActor != null && !self.World.ActorMap.GetActorsAt(cell) + .Any(a => a != IgnoreActor && a != self && self.World.Map.DistanceAboveTerrain(a.CenterPosition) == WDist.Zero)) return; var onWater = info.WaterTerrainTypes.Contains(self.World.Map.GetTerrainInfo(cell).Type); - var sound = onWater ? info.WaterImpactSound : info.GroundImpactSound; Game.Sound.Play(SoundType.World, sound, self.CenterPosition);