From 076c8daf55673abf8e162be0f56d541ec4cfecd1 Mon Sep 17 00:00:00 2001 From: Sophie Date: Sat, 9 Apr 2016 16:02:17 -0400 Subject: [PATCH] fixed ejecting failing because of stun --- Assets/Scripts/Astronaut.cs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Assets/Scripts/Astronaut.cs b/Assets/Scripts/Astronaut.cs index 3ea2e70..087d27e 100644 --- a/Assets/Scripts/Astronaut.cs +++ b/Assets/Scripts/Astronaut.cs @@ -251,9 +251,12 @@ public class Astronaut : MonoBehaviour { /// public void Stun() { - State = AstronautState.Stun; - StartCoroutine(StunTimeout()); - _astronautAnimator.Stun(); + if (State < AstronautState.Ejecting) + { + State = AstronautState.Stun; + StartCoroutine(StunTimeout()); + _astronautAnimator.Stun(); + } } IEnumerator StunTimeout() @@ -262,8 +265,11 @@ public class Astronaut : MonoBehaviour { { yield return null; } - State = AstronautState.Idle; - _astronautAnimator.Idle(); + if (State < AstronautState.Ejecting) + { + State = AstronautState.Idle; + _astronautAnimator.Idle(); + } } public void OnGUI()