From 9cbe7bc62dd7bf3036857bd70951cf90a2861750 Mon Sep 17 00:00:00 2001
From: abcdefg30 <alphabet@streber24.de>
Date: Sat, 13 Oct 2018 00:06:59 +0200
Subject: [PATCH] Fix infantry getting stuck in the last attack frame

---
 .../Traits/Render/WithInfantryBody.cs         | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/OpenRA.Mods.Common/Traits/Render/WithInfantryBody.cs b/OpenRA.Mods.Common/Traits/Render/WithInfantryBody.cs
index 0b0ed4caaf..a6601182c1 100644
--- a/OpenRA.Mods.Common/Traits/Render/WithInfantryBody.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithInfantryBody.cs
@@ -69,12 +69,13 @@ namespace OpenRA.Mods.Common.Traits.Render
 			rs.Add(new AnimationWithOffset(DefaultAnimation, null, () => IsTraitDisabled));
 			PlayStandAnimation(self);
 
-			state = AnimationState.Waiting;
 			move = init.Self.Trait<IMove>();
 		}
 
 		public void PlayStandAnimation(Actor self)
 		{
+			state = AnimationState.Waiting;
+
 			var sequence = DefaultAnimation.GetRandomExistingSequence(Info.StandSequences, Game.CosmeticRandom);
 			if (sequence != null)
 			{
@@ -96,8 +97,8 @@ namespace OpenRA.Mods.Common.Traits.Render
 
 			if (DefaultAnimation.HasSequence(prefix + baseSequence))
 				return prefix + baseSequence;
-			else
-				return baseSequence;
+
+			return baseSequence;
 		}
 
 		protected virtual bool AllowIdleAnimation(Actor self)
@@ -114,7 +115,7 @@ namespace OpenRA.Mods.Common.Traits.Render
 			if (!string.IsNullOrEmpty(sequence) && DefaultAnimation.HasSequence(NormalizeInfantrySequence(self, sequence)))
 			{
 				state = AnimationState.Attacking;
-				DefaultAnimation.PlayThen(NormalizeInfantrySequence(self, sequence), () => state = AnimationState.Idle);
+				DefaultAnimation.PlayThen(NormalizeInfantrySequence(self, sequence), () => PlayStandAnimation(self));
 			}
 		}
 
@@ -147,10 +148,7 @@ namespace OpenRA.Mods.Common.Traits.Render
 			}
 			else if (((state == AnimationState.Moving || dirty) && !move.IsMoving)
 				|| ((state == AnimationState.Idle || state == AnimationState.IdleAnimating) && !self.IsIdle))
-			{
-				state = AnimationState.Waiting;
 				PlayStandAnimation(self);
-			}
 
 			dirty = false;
 		}
@@ -175,18 +173,11 @@ namespace OpenRA.Mods.Common.Traits.Render
 					if (idleDelay > 0 && --idleDelay == 0)
 					{
 						state = AnimationState.IdleAnimating;
-						DefaultAnimation.PlayThen(idleSequence, () =>
-						{
-							PlayStandAnimation(self);
-							state = AnimationState.Waiting;
-						});
+						DefaultAnimation.PlayThen(idleSequence, () => PlayStandAnimation(self));
 					}
 				}
 				else
-				{
 					PlayStandAnimation(self);
-					state = AnimationState.Waiting;
-				}
 			}
 		}