public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 15:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Scripts/Hunter): Fixed freeze while using Readiness. (#8709)

Browse Source 
Fixes #8513
This commit is contained in:
UltraNix
2021-10-26 10:17:00 +02:00
committed by GitHub
parent bcb9542e95
commit 04aac67970
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/server/scripts/Spells/spell_hunter.cpp
View File

@@ -786,25 +786,23 @@ public:
Player* caster = GetCaster()->ToPlayer(); Player* caster = GetCaster()->ToPlayer();
// immediately finishes the cooldown on your other Hunter abilities except Bestial Wrath // immediately finishes the cooldown on your other Hunter abilities except Bestial Wrath
PlayerSpellMap const& spellMap = caster->GetSpellMap(); // force removal of the disarm cooldown
for (PlayerSpellMap::const_iterator itr = spellMap.begin(); itr != spellMap.end(); ++itr) caster->RemoveSpellCooldown(SPELL_HUNTER_CHIMERA_SHOT_SCORPID);
{
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(itr->first);
if (spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER &&
spellInfo->Id != SPELL_HUNTER_READINESS &&
spellInfo->Id != SPELL_HUNTER_BESTIAL_WRATH &&
spellInfo->Id != SPELL_DRAENEI_GIFT_OF_THE_NAARU &&
spellInfo->GetRecoveryTime() > 0)
{
SpellCooldowns::iterator citr = caster->GetSpellCooldownMap().find(spellInfo->Id);
if (citr != caster->GetSpellCooldownMap().end() && citr->second.needSendToClient)
caster->RemoveSpellCooldown(spellInfo->Id, true);
else
caster->RemoveSpellCooldown(spellInfo->Id, false);
}
// force removal of the disarm cooldown SpellCooldowns& cooldowns = caster->GetSpellCooldownMap();
caster->RemoveSpellCooldown(SPELL_HUNTER_CHIMERA_SHOT_SCORPID, false);
SpellCooldowns::iterator itr, next;
for (itr = cooldowns.begin(); itr != cooldowns.end(); itr = next)
{
next = itr;
++next;
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(itr->first);
if (spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER && spellInfo->Id != SPELL_HUNTER_READINESS && spellInfo->Id != SPELL_HUNTER_BESTIAL_WRATH &&
spellInfo->Id != SPELL_DRAENEI_GIFT_OF_THE_NAARU && spellInfo->GetRecoveryTime() > 0)
{
caster->RemoveSpellCooldown(spellInfo->Id, itr->second.needSendToClient);
}
} }
} }