Update HealthBar

project-fika · Jul 16, 2024 · 4c9ad5a · 4c9ad5a
1 parent a7f2432
commit 4c9ad5a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/Fika.Core/Bundles/Files/playerui.bundle b/Fika.Core/Bundles/Files/playerui.bundle
diff --git a/Fika.Core/Coop/Custom/FikaHealthBar.cs b/Fika.Core/Coop/Custom/FikaHealthBar.cs
@@ -183,6 +183,7 @@ private void CreateHealthBar()
             {
                 currentPlayer.HealthController.EffectAddedEvent += HealthController_EffectAddedEvent;
                 currentPlayer.HealthController.EffectRemovedEvent += HealthController_EffectRemovedEvent;
+                AddAllActiveEffects();
             }
 
             FikaPlugin.UsePlateFactionSide.SettingChanged += UsePlateFactionSide_SettingChanged;
@@ -262,12 +263,7 @@ private void ShowEffects_SettingChanged(object sender, EventArgs e)
             {
                 currentPlayer.HealthController.EffectAddedEvent += HealthController_EffectAddedEvent;
                 currentPlayer.HealthController.EffectRemovedEvent += HealthController_EffectRemovedEvent;
-
-                IEnumerable<IEffect> currentEffects = currentPlayer.HealthController.GetAllActiveEffects();
-                foreach (IEffect effect in currentEffects)
-                {
-                    AddEffect(effect);
-                }
+                AddAllActiveEffects();
             }
             else
             {
@@ -285,6 +281,15 @@ private void ShowEffects_SettingChanged(object sender, EventArgs e)
             }
         }
 
+        private void AddAllActiveEffects()
+        {
+            IEnumerable<IEffect> currentEffects = currentPlayer.HealthController.GetAllActiveEffects();
+            foreach (IEffect effect in currentEffects)
+            {
+                AddEffect(effect);
+            }
+        }
+
         private void HealthController_DiedEvent(EDamageType obj)
         {
             Destroy(this);
@@ -413,7 +418,10 @@ protected void OnDestroy()
             currentPlayer.HealthController.EffectAddedEvent -= HealthController_EffectAddedEvent;
             currentPlayer.HealthController.EffectRemovedEvent -= HealthController_EffectRemovedEvent;
 
+
+
             playerPlate.gameObject.SetActive(false);
+            effects.Clear();
             Destroy(this);
         }