Core/Misc: Various crash fixes

Port From (https://github.com/TrinityCore/TrinityCore/commit/4f65dc5e20cc3af5b3595809707c632faa6e5900)
2019-08-17 11:23:32 -04:00
parent a44224564c
commit 2d2a72ce3e
13 changed files with 65 additions and 37 deletions
@@ -189,6 +189,9 @@ namespace Game.Spells

        public void HandleCooldowns(SpellInfo spellInfo, uint itemId, Spell spell = null)
        {
+            if (spell != null && spell.IsIgnoringCooldowns())
+                return;
+
            if (ConsumeCharge(spellInfo.ChargeCategoryId))
                return;

@@ -207,7 +210,7 @@ namespace Game.Spells
                }
            }

-            if (spellInfo.IsCooldownStartedOnEvent() || spellInfo.IsPassive() || (spell && spell.IsIgnoringCooldowns()))
+            if (spellInfo.IsCooldownStartedOnEvent() || spellInfo.IsPassive())
                return;

            StartCooldown(spellInfo, itemId, spell);