diff options
| author | Shauren <shauren.trinity@gmail.com> | 2017-05-25 00:23:05 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2017-05-25 00:24:37 +0200 |
| commit | 38c6694b8eb2c2ca7de799d47edc718c4d5ec717 (patch) | |
| tree | 58b9522e954cb0e0aa86f62bde22659314535185 /src/server/scripts/Outland | |
| parent | d4eb2f79ca09b5a8d72ba8bbf30b76305f0e2140 (diff) | |
More nopch fixes
Diffstat (limited to 'src/server/scripts/Outland')
3 files changed, 13 insertions, 4 deletions
diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 21e1a80d753..461c4c0f66e 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -24,9 +24,12 @@ SDCategory: Black Temple EndScriptData */ #include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "black_temple.h" +#include "ObjectAccessor.h" +#include "ScriptedCreature.h" #include "Spell.h" +#include "SpellInfo.h" +#include "TemporarySummon.h" enum ReliquaryOfSouls { @@ -563,7 +566,7 @@ public: void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { if (me->GetCurrentSpell(CURRENT_GENERIC_SPELL)) - for (SpellEffectInfo const* effect : spell->GetEffectsForDifficulty(me->GetMap()->GetDifficultyID())) + for (SpellEffectInfo const* effect : spell->GetEffectsForDifficulty(GetDifficulty())) if (effect->Effect == SPELL_EFFECT_INTERRUPT_CAST) if (me->GetCurrentSpell(CURRENT_GENERIC_SPELL)->m_spellInfo->Id == SPELL_SOUL_SHOCK || me->GetCurrentSpell(CURRENT_GENERIC_SPELL)->m_spellInfo->Id == SPELL_DEADEN) diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index b65e814c1dd..e3e2d731764 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -25,6 +25,8 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "SpellInfo.h" +#include "SpellMgr.h" #include "SpellScript.h" #include "gruuls_lair.h" diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 191634739d4..ccda9fd839d 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -24,8 +24,12 @@ SDCategory: Tempest Keep, The Eye EndScriptData */ #include "ScriptMgr.h" +#include "GameObject.h" +#include "InstanceScript.h" +#include "ObjectAccessor.h" #include "ScriptedCreature.h" -#include "Spell.h" +#include "SpellInfo.h" +#include "SpellMgr.h" #include "SpellScript.h" #include "the_eye.h" @@ -843,7 +847,7 @@ class boss_kaelthas : public CreatureScript default: break; } - + if (me->HasUnitState(UNIT_STATE_CASTING) && !me->FindCurrentSpellBySpellId(SPELL_KAEL_GAINING_POWER) && !me->FindCurrentSpellBySpellId(SPELL_KAEL_STUNNED)) return; } |
