diff options
| author | offl <11556157+offl@users.noreply.github.com> | 2021-10-07 16:03:38 +0300 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-19 23:14:52 +0100 |
| commit | 2e3f2400519a0bcf1d15f62905ab4447619d4fe2 (patch) | |
| tree | 698b67d49360f7f3f4217cea171127e1f0e4881a /src/server/game | |
| parent | 64a91288d63bc2c5cda7272c2c7068b1a6c4d783 (diff) | |
Scripts/Spells: Handle quest tame spells in spell script (#27022)
(cherry picked from commit 4441d42253d64ccd8fc9f78f1b44c851d6408312)
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 29 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellInfo.h | 1 |
3 files changed, 0 insertions, 38 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 3e747c72915..c8371d54199 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -4568,35 +4568,6 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool // AT REMOVE else { - if ((GetSpellInfo()->IsQuestTame()) && caster && caster->IsAlive() && target->IsAlive()) - { - uint32 finalSpelId = 0; - switch (GetId()) - { - case 19548: finalSpelId = 19597; break; - case 19674: finalSpelId = 19677; break; - case 19687: finalSpelId = 19676; break; - case 19688: finalSpelId = 19678; break; - case 19689: finalSpelId = 19679; break; - case 19692: finalSpelId = 19680; break; - case 19693: finalSpelId = 19684; break; - case 19694: finalSpelId = 19681; break; - case 19696: finalSpelId = 19682; break; - case 19697: finalSpelId = 19683; break; - case 19699: finalSpelId = 19685; break; - case 19700: finalSpelId = 19686; break; - case 30646: finalSpelId = 30647; break; - case 30653: finalSpelId = 30648; break; - case 30654: finalSpelId = 30652; break; - case 30099: finalSpelId = 30100; break; - case 30102: finalSpelId = 30103; break; - case 30105: finalSpelId = 30104; break; - } - - if (finalSpelId) - caster->CastSpell(target, finalSpelId, this); - } - switch (m_spellInfo->SpellFamilyName) { case SPELLFAMILY_GENERIC: diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index ea1b05abf95..c6ad525b658 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1409,14 +1409,6 @@ bool SpellInfo::IsLootCrafting() const return HasEffect(SPELL_EFFECT_CREATE_RANDOM_ITEM) || HasEffect(SPELL_EFFECT_CREATE_LOOT); } -bool SpellInfo::IsQuestTame() const -{ - if (GetEffects().size() < 2) - return false; - - return GetEffect(EFFECT_0).Effect == SPELL_EFFECT_THREAT && GetEffect(EFFECT_1).Effect == SPELL_EFFECT_APPLY_AURA && GetEffect(EFFECT_1).ApplyAuraName == SPELL_AURA_DUMMY; -} - bool SpellInfo::IsProfession() const { for (SpellEffectInfo const& effect : GetEffects()) diff --git a/src/server/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h index bb4c11871f4..0000291e369 100644 --- a/src/server/game/Spells/SpellInfo.h +++ b/src/server/game/Spells/SpellInfo.h @@ -487,7 +487,6 @@ class TC_GAME_API SpellInfo bool IsExplicitDiscovery() const; bool IsLootCrafting() const; - bool IsQuestTame() const; bool IsProfession() const; bool IsPrimaryProfession() const; bool IsPrimaryProfessionFirstRank() const; |