Unsubscribe all GunController delegates on destruction

hackerspace-ntnu · Dec 30, 2024 · 8acb19b · 8acb19b
1 parent 7493661
commit 8acb19b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/Assets/Scripts/Augment/GunController.cs b/Assets/Scripts/Augment/GunController.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using Mirror;
 using UnityEngine;
 using UnityEngine.InputSystem;
@@ -106,11 +105,31 @@ public void Initialize()
 
     private void OnDestroy()
     {
+        UnsubscribeDelegates();
+    }
+
+    public void UnsubscribeDelegates()
+    {
+        onInitializeGun = null;
+        onFire = null;
+        onFireEnd = null;
+        onFireNoAmmo = null;
+        onFireStart = null;
+        onInitializeBullet = null;
+        onReload = null;
+
+        projectile.OnColliderHit = null;
+        projectile.OnHitboxCollision = null;
+        projectile.OnNetworkInit = null;
+        projectile.OnProjectileInit = null;
+        projectile.OnProjectileTravel = null;
+        projectile.OnRicochet = null;
+
         if (!barrelAnimator)
             return;
 
-        if (HasRecoil)
-            barrelAnimator.OnShotFiredAnimation -= PlayRecoil;
+
+        barrelAnimator.OnShotFiredAnimation -= PlayRecoil;
         barrelAnimator.OnShotFiredAnimation -= ShotFired;
         barrelAnimator.OnAnimationEnd -= FireEnd;
 
@@ -217,6 +236,8 @@ private void RpcFireWithNoAmmo()
 
     private void FireGun()
     {
+        if (stats == null)
+            return;
         if (stats.Ammo <= 0)
         {
             CmdFireWithNoAmmo();

diff --git a/Assets/Scripts/Gamestate/PlayerManager.cs b/Assets/Scripts/Gamestate/PlayerManager.cs
@@ -551,11 +551,13 @@ public void SetGunNetwork(Transform offset)
 
     public void RemoveGun()
     {
+        gunController.UnsubscribeDelegates();
         for (int i = gunController.transform.childCount - 1; i >= 0; i--)
         {
             Destroy(gunController.transform.GetChild(i).gameObject);
         }
         Destroy(gunController.gameObject);
+        GunOrigin.GetComponent<GunController>().UnsubscribeDelegates();
         for (int i = GunOrigin.transform.childCount - 1; i >= 0; i--)
         {
             Destroy(GunOrigin.transform.GetChild(i).gameObject);