From 990d992276c9bb554a98a02dd5670b615ba2c362 Mon Sep 17 00:00:00 2001
From: sebastianhampel1 <hampel.m@northeastern.edu>
Date: Thu, 15 Jun 2023 12:11:38 -0400
Subject: [PATCH] Fixing networked interaction handler

---
 Assets/Scripts/Item/Pistol/PistolComponent.cs | 11 ++--------
 .../Player/PlayerInteractionHandler.cs        | 22 +++++++++----------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/Assets/Scripts/Item/Pistol/PistolComponent.cs b/Assets/Scripts/Item/Pistol/PistolComponent.cs
index ac5fa4f..fa870dc 100644
--- a/Assets/Scripts/Item/Pistol/PistolComponent.cs
+++ b/Assets/Scripts/Item/Pistol/PistolComponent.cs
@@ -48,17 +48,10 @@ namespace Item
         private GameObject targetObject;
         private float timeSinceLightDuration;
         public bool IsLightOn => targetingLight.gameObject.activeSelf;
+       
 
         //private Dictionary<int,float> projectiles = new Dictionary<int, float>(); 
-        public override void OnStartClient()
-        {
-            base.OnStartClient();
-            
-            if (!IsOwner)
-            {
-                this.enabled = false;
-            }
-        }
+       
         // Start is called before the first frame update
         private void Start()
         {
diff --git a/Assets/Scripts/Player/PlayerInteractionHandler.cs b/Assets/Scripts/Player/PlayerInteractionHandler.cs
index e386411..8f670f5 100644
--- a/Assets/Scripts/Player/PlayerInteractionHandler.cs
+++ b/Assets/Scripts/Player/PlayerInteractionHandler.cs
@@ -48,16 +48,16 @@ public class PlayerInteractionHandler : NetworkBehaviour
     public Item.Inventory Inventory => invent;
     public bool IsCarrying => heavyInvent != null;
     public bool GunEnabled { get; private set; }
+        
 
     public Transform CarryingPos => carryingPos;
+        private bool inputEnbaled = true;
 
         public override void OnStartClient()
         {
             base.OnStartClient();
-            if (!base.IsOwner)
-            {
-                this.enabled = false;
-            }
+            inputEnbaled = IsOwner;
+            
         }
 
         // Start is called before the first frame update
@@ -87,9 +87,9 @@ public class PlayerInteractionHandler : NetworkBehaviour
             return;
         }
 
-        if (manager.IsPaused || isDead) return;
+        if ((manager.IsPaused || isDead)&&!inputEnbaled) return;
 
-        if (Input.GetButtonDown("Fire1") || fireDown.IsDown())
+        if ((Input.GetButtonDown("Fire1") || fireDown.IsDown())&&inputEnbaled)
         {
             if (GunEnabled)
             {
@@ -169,7 +169,7 @@ public class PlayerInteractionHandler : NetworkBehaviour
             }
         }
 
-        if (Input.GetButtonDown("Fire2"))
+        if (Input.GetButtonDown("Fire2")&&inputEnbaled)
         {
             //print(this.GunEnabled);
             if (!GunEnabled)
@@ -185,7 +185,7 @@ public class PlayerInteractionHandler : NetworkBehaviour
             }
         }
 
-        if (Input.GetButtonDown("Fire3"))
+        if (Input.GetButtonDown("Fire3")&&inputEnbaled)
             if (!IsCarrying)
             {
                 GunEnabled = !GunEnabled;
@@ -201,14 +201,14 @@ public class PlayerInteractionHandler : NetworkBehaviour
             DisableFlashlight();
 
             var aimAxis = Input.GetAxis("Aim");
-
+            
             if (aimAxis > 0.5f)
                 pistol.aimMode = Item.PistolComponent.AimMode.CAMERA;
             else
                 pistol.aimMode = Item.PistolComponent.AimMode.MODIFIED;
         }
-
-        shift.SetCenter(!GunEnabled);
+        if(!inputEnbaled)
+            shift.SetCenter(!GunEnabled);
     }