Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Spells: Fixed crash in SpellHistory::ModifySpellCooldown when cooldown is fully reset

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/d86726e670db5813da48c60dde1d6a59270a3417)
This commit is contained in:
hondacrx
2023-01-11 01:13:58 -05:00
parent 7c9c7a17d1
commit 3b28d70769
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/SpellHistory.cs
+6 -6
View File
@@ -539,12 +539,6 @@ namespace Game.Spells
cooldownEntry.CooldownEnd = cooldownEntry.CategoryEnd; cooldownEntry.CooldownEnd = cooldownEntry.CategoryEnd;
} }
if (cooldownEntry.CooldownEnd <= now)
{
_categoryCooldowns.Remove(cooldownEntry.CategoryId);
_spellCooldowns.Remove(cooldownEntry.SpellId);
}
Player playerOwner = GetPlayerOwner(); Player playerOwner = GetPlayerOwner();
if (playerOwner) if (playerOwner)
{ {
@@ -555,6 +549,12 @@ namespace Game.Spells
modifyCooldown.WithoutCategoryCooldown = withoutCategoryCooldown; modifyCooldown.WithoutCategoryCooldown = withoutCategoryCooldown;
playerOwner.SendPacket(modifyCooldown); playerOwner.SendPacket(modifyCooldown);
} }
if (cooldownEntry.CooldownEnd <= now)
{
_categoryCooldowns.Remove(cooldownEntry.CategoryId);
_spellCooldowns.Remove(cooldownEntry.SpellId);
}
} }
public void ModifyCooldown(uint spellId, TimeSpan cooldownMod, bool withoutCategoryCooldown = false) public void ModifyCooldown(uint spellId, TimeSpan cooldownMod, bool withoutCategoryCooldown = false)