nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-28 08:06:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Playerbot

Browse Source
This commit is contained in:
Yunfan Li
2025-06-29 10:55:43 +08:00
parent c3fbb2da20 f4e049f227
commit 24fa79040f
18 changed files with 409 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/game/Entities/Player/Player.cpp
View File

@@ -10013,6 +10013,16 @@ void Player::RemoveSpellMods(Spell* spell)
continue;
}
}
// ROGUE MUTILATE WITH COLD BLOOD
if (spellInfo->Id == 5374)
{
SpellInfo const* sp = mod->ownerAura->GetSpellInfo();
if (sp->Id == 14177) // Cold Blood
{
mod->charges = 1;
continue;
}
}
if (mod->ownerAura->DropCharge(AURA_REMOVE_BY_EXPIRE))
itr = m_spellMods[i].begin();

5
src/server/game/Spells/Spell.cpp
View File

@@ -4544,6 +4544,11 @@ void Spell::finish(bool ok)
// Xinef: Reset cooldown event in case of fail cast
if (m_spellInfo->IsCooldownStartedOnEvent())
m_caster->ToPlayer()->SendCooldownEvent(m_spellInfo, 0, 0, false);
// Rogue fix: Remove Cold Blood if Mutilate off-hand failed
if (m_spellInfo->Id == 27576) // Mutilate, off-hand
if (m_caster->HasAura(14177))
m_caster->RemoveAura(14177);
}
return;
}