Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 15:40:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add missing initialization of _lastExtraAttackSpell. Do not use hardcoded spell ids.

Browse Source
This commit is contained in:
trickerer
2021-08-30 17:21:49 +07:00
parent 13b45e076b
commit 9f90b83501
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -388,6 +388,8 @@ Unit::Unit(bool isWorldObject) :
_isWalkingBeforeCharm = false;
_instantCast = false;
_isCombatDisallowed = false;
_lastExtraAttackSpell = 0;
}
////////////////////////////////////////////////////////////

8
src/server/game/Spells/Auras/SpellAuraEffects.cpp
View File

@@ -992,8 +992,7 @@ bool AuraEffect::CheckEffectProc(AuraApplication* aurApp, ProcEventInfo& eventIn
{
if (triggeredSpellInfo->HasEffect(SPELL_EFFECT_ADD_EXTRA_ATTACKS))
{
Unit const* source = eventInfo.GetActor();
uint32 lastExtraAttackSpell = source->GetLastExtraAttackSpell();
uint32 lastExtraAttackSpell = eventInfo.GetActor()->GetLastExtraAttackSpell();
// Patch 1.12.0(?) extra attack abilities can no longer chain proc themselves
if (lastExtraAttackSpell == triggerSpellId)
@@ -1001,8 +1000,9 @@ bool AuraEffect::CheckEffectProc(AuraApplication* aurApp, ProcEventInfo& eventIn
// Patch 2.2.0 Sword Specialization (Warrior, Rogue) extra attack can no longer proc additional extra attacks
// 3.3.5 Sword Specialization (Warrior), Hack and Slash (Rogue)
if (lastExtraAttackSpell == 16459 || lastExtraAttackSpell == 66923)
return false;
if (SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(lastExtraAttackSpell))
if (spellInfo->SpellIconID == 1462)
return false;
}
}
break;