Reapply "fix1.2"

This reverts commit 0b1a359bd9.
2026-08-20 11:38:40 +02:00
parent 0b1a359bd9
commit dea33b7613
3 changed files with 17 additions and 0 deletions
@@ -11,7 +11,12 @@ public class Shoot : MonoBehaviour
    void Start()
    {
 <<<<<<< HEAD
+<<<<<<< HEAD
        
+=======
+        if (weapon == null)
+            weapon = FindFirstObjectByType<WeaponReload>();
+>>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
 =======
        if (weapon == null)
            weapon = FindFirstObjectByType<WeaponReload>();
@@ -20,6 +25,7 @@ public class Shoot : MonoBehaviour

    void Update()
    {
+<<<<<<< HEAD
 <<<<<<< HEAD
        
        if ( AR == true && Input.GetKey(KeyCode.Mouse0))
@@ -28,6 +34,11 @@ public class Shoot : MonoBehaviour
        
        if (AR == true && Input.GetKey(KeyCode.Mouse0) && Time.time >= nextShotTime)
 >>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
+=======
+        if (PauseMenu.GameIsPaused) return;
+        
+        if (AR == true && Input.GetKey(KeyCode.Mouse0) && Time.time >= nextShotTime)
+>>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
        {
            Shot(spawnPointAR);
        }