fix multiple problems in GetSpellRemainingCooldown (#1909)

AscensionGameDev · Sep 19, 2023 · 9b187bd · 9b187bd
1 parent fa8b808
commit 9b187bd
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Intersect.Client/Entities/Player.cs b/Intersect.Client/Entities/Player.cs
@@ -582,14 +582,14 @@ public bool IsSpellOnCooldown(int slot)
 
         public long GetSpellRemainingCooldown(int slot)
         {
-            if (Spells[slot] != null)
+            var spl = Spells[slot];
+            if (spl != null)
             {
-                var spl = Spells[slot];
                 if (spl.Id != Guid.Empty)
                 {
-                    if (SpellCooldowns.ContainsKey(spl.Id) && SpellCooldowns[spl.Id] > Timing.Global.Milliseconds)
+                    if (SpellCooldowns.TryGetValue(spl.Id, out var cd) && cd > Timing.Global.Milliseconds)
                     {
-                        return ItemCooldowns[spl.Id] - Timing.Global.Milliseconds;
+                        return cd - Timing.Global.Milliseconds;
                     }
                     else if ((SpellBase.TryGet(spl.Id, out var spellBase) && !spellBase.IgnoreGlobalCooldown) && Globals.Me.GlobalCooldown > Timing.Global.Milliseconds)
                     {