From 2b363e4e1cd447603ad1bbade115052612e6107e Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sat, 5 Dec 2020 11:52:31 +0100 Subject: [PATCH] Fix WithInfantryBody wrongly overwriting attack animations --- OpenRA.Mods.Common/Traits/Render/WithInfantryBody.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenRA.Mods.Common/Traits/Render/WithInfantryBody.cs b/OpenRA.Mods.Common/Traits/Render/WithInfantryBody.cs index 710384e2b5..646968b055 100644 --- a/OpenRA.Mods.Common/Traits/Render/WithInfantryBody.cs +++ b/OpenRA.Mods.Common/Traits/Render/WithInfantryBody.cs @@ -160,6 +160,10 @@ namespace OpenRA.Mods.Common.Traits.Render protected virtual void Tick(Actor self) { + // Attacking takes care of reverting back to PlayStandAnimation + if (state == AnimationState.Attacking) + return; + if (rsm != null) { if (wasModifying != rsm.IsModifyingSequence)