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

fix(Core/Spells): Implement SPELL_ATTR7_INTERRUPT_ONLY_NONPLAYER. (#3313)

Browse Source 
Co-authored-by: HeartWell <moki.play@mail.ru>
Co-authored-by: Francesco Borzì <borzifrancesco@gmail.com>
Co-authored-by: Stefano Borzì <stefanoborzi32@gmail.com>
This commit is contained in:
Petric
2020-09-03 11:02:00 +01:00
committed by GitHub
parent a51c865a40
commit 15cc6fe0b6
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2861,6 +2861,10 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target)
if (missInfo != SPELL_MISS_EVADE && effectUnit != m_caster && m_caster->IsFriendlyTo(effectUnit) && m_spellInfo->IsPositive() && effectUnit->IsInCombat())
m_caster->SetInCombatWith(effectUnit);
// Check for SPELL_ATTR7_INTERRUPT_ONLY_NONPLAYER
if (m_spellInfo->HasAttribute(SPELL_ATTR7_INTERRUPT_ONLY_NONPLAYER) && effectUnit->GetTypeId() != TYPEID_PLAYER)
caster->CastSpell(effectUnit, SPELL_INTERRUPT_NONPLAYER, true);
if (spellHitTarget)
{
//AI functions

2
src/server/game/Spells/Spell.h
View File

@@ -234,6 +234,8 @@ struct ChannelTargetData
SpellDestination spellDst;
};
static const uint32 SPELL_INTERRUPT_NONPLAYER = 32747;
class Spell
{
friend void Unit::SetCurrentCastedSpell(Spell* pSpell);

8
src/server/game/Spells/SpellMgr.cpp
View File

@@ -6363,6 +6363,14 @@ void SpellMgr::LoadDbcDataCorrections()
spellInfo->EffectImplicitTargetA[EFFECT_1] = TARGET_UNIT_TARGET_ANY;
spellInfo->EffectImplicitTargetA[EFFECT_2] = TARGET_UNIT_TARGET_ANY;
break;
// Check for SPELL_ATTR7_INTERRUPT_ONLY_NONPLAYER
case 47476: // Deathknight - Strangulate
case 15487: // Priest - Silence
case 5211: // Druid - Bash - R1
case 6798: // Druid - Bash - R2
case 8983: // Druid - Bash - R3
spellInfo->AttributesEx7 |= SPELL_ATTR7_INTERRUPT_ONLY_NONPLAYER;
break;
}
switch (spellInfo->SpellFamilyName)