From f3ebe07540ac78d56c69ea3ff733875bfa522e6f Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 5 Dec 2020 13:50:18 +0000 Subject: [PATCH] Fix WithDeliveryAnimation overriding sell animation. --- OpenRA.Mods.Common/Traits/Render/WithDeliveryAnimation.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Traits/Render/WithDeliveryAnimation.cs b/OpenRA.Mods.Common/Traits/Render/WithDeliveryAnimation.cs index 823a9a3be7..ff87de29fa 100644 --- a/OpenRA.Mods.Common/Traits/Render/WithDeliveryAnimation.cs +++ b/OpenRA.Mods.Common/Traits/Render/WithDeliveryAnimation.cs @@ -44,7 +44,9 @@ namespace OpenRA.Mods.Common.Traits.Render public void Delivered(Actor self) { - wsb.CancelCustomAnimation(self); + // Animation has already been cancelled by TraitDisabled below + if (!IsTraitDisabled) + wsb.CancelCustomAnimation(self); } protected override void TraitDisabled(Actor self)