Add fix for #228

hackerspace-ntnu · Oct 16, 2023 · d4d6eec · d4d6eec
1 parent 753567c
commit d4d6eec
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/Assets/Scripts/Augment/AugmentImplementations/DDRBody.cs b/Assets/Scripts/Augment/AugmentImplementations/DDRBody.cs
@@ -40,6 +40,7 @@ public class DDRBody : GunBody
 
     private const float targetHeight = 3;
     private const float startHeight = targetHeight - screenHeight;
+    private const float lowestCheckHeight = 2.5f;
 
     [SerializeField]
     private Precision[] precisionsGoodToBad;
@@ -126,6 +127,9 @@ private void Fire(InputAction.CallbackContext ctx)
 
     private void ArrowSelect(InputAction.CallbackContext ctx)
     {
+        if (arrowHeight < lowestCheckHeight)
+            return;
+
         switch (arrowDirection)
         {
             case ArrowDirection.NORTH:
@@ -193,7 +197,12 @@ private void ResetArrow()
 
     private void OnDestroy()
     {
-        if (gunController)
-            gunController.player.inputManager.onMovePerformed -= ArrowSelect;
+        if (!gunController)
+            return;
+        if (!gunController.player)
+            return;
+
+        gunController.player.inputManager.onFirePerformed -= Fire;
+        gunController.player.inputManager.onMovePerformed -= ArrowSelect;
     }
 }