fixed raid mode removing custom timers

smasherprog · Dec 19, 2024 · f5004f7 · f5004f7
1 parent 5fac27a
commit f5004f7
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/EQTool/ViewModels/SpellWindowViewModel.cs b/EQTool/ViewModels/SpellWindowViewModel.cs
@@ -189,17 +189,20 @@ public void UpdateSpells(double dt_ms)
                 foreach (var item in SpellList.Where(a => timerTypes.Contains(a.SpellViewModelType)).Cast<TimerViewModel>().ToList())
                 {
                     var hidespell = false;
-                    if (item.GetType() != typeof(RollViewModel))
+                    if (item.GroupName != CustomTimer.CustomerTime)
                     {
-                        if (!MasterNPCList.NPCs.Contains(item.GroupName.Trim()))
+                        if (item.SpellViewModelType == SpellViewModelType.Timer)
                         {
-                            if (settings.YouOnlySpells)
+                            if (!MasterNPCList.NPCs.Contains(item.GroupName.Trim()))
                             {
-                                hidespell = !(item.GroupName == CustomTimer.CustomerTime || item.GroupName == EQSpells.SpaceYou);
-                            }
-                            else if (RaidModeEnabled && item.GroupName != EQSpells.SpaceYou)
-                            {
-                                hidespell = true;
+                                if (settings.YouOnlySpells)
+                                {
+                                    hidespell = !(item.GroupName == CustomTimer.CustomerTime || item.GroupName == EQSpells.SpaceYou);
+                                }
+                                else if (RaidModeEnabled && item.GroupName != EQSpells.SpaceYou)
+                                {
+                                    hidespell = true;
+                                }
                             }
                         }
                     }