diff options
| author | MitchesD <majklprofik@seznam.cz> | 2015-03-27 15:34:53 +0100 |
|---|---|---|
| committer | MitchesD <majklprofik@seznam.cz> | 2015-03-27 15:34:53 +0100 |
| commit | b05d74ba469df10981cdeab7ed2dff960b7a3236 (patch) | |
| tree | 5f061d495a9db3afe3d646adab8b0cde395023e0 /src | |
| parent | 39bdd06446dc8ae6f19e017e4390bd2aa7834d03 (diff) | |
| parent | bc8f4ee9768d558a4e270dd55c397fb8d0596e46 (diff) | |
Merge pull request #14461 from gigatotem/6.x
[6.x] Heroism/Bloodlust/Time Warp
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/Spells/spell_mage.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_shaman.cpp | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index 91ef240a1a3..2e3f5f051b5 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -85,6 +85,7 @@ enum MageSpells SPELL_MAGE_FINGERS_OF_FROST = 44544, SPELL_MAGE_TEMPORAL_DISPLACEMENT = 80354, + SPELL_PET_NETHWERINDS_FATIGUED = 160455, }; enum MageIcons @@ -1434,7 +1435,8 @@ class spell_mage_time_warp : public SpellScriptLoader if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_TEMPORAL_DISPLACEMENT) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_INSANITY) || !sSpellMgr->GetSpellInfo(SPELL_SHAMAN_EXHAUSTION) - || !sSpellMgr->GetSpellInfo(SPELL_SHAMAN_SATED)) + || !sSpellMgr->GetSpellInfo(SPELL_SHAMAN_SATED) + || !sSpellMgr->GetSpellInfo(SPELL_PET_NETHWERINDS_FATIGUED)) return false; return true; } diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index f9224e435af..af4ff1f4485 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -61,7 +61,8 @@ enum ShamanSpells SPELL_SHAMAN_TOTEM_EARTHBIND_TOTEM = 6474, SPELL_SHAMAN_TOTEM_EARTHEN_POWER = 59566, SPELL_SHAMAN_TOTEM_HEALING_STREAM_HEAL = 52042, - SPELL_SHAMAN_TIDAL_WAVES = 53390 + SPELL_SHAMAN_TIDAL_WAVES = 53390, + SPELL_PET_NETHERWINDS_FATIGUED = 160455 }; enum ShamanSpellIcons @@ -176,7 +177,8 @@ class spell_sha_bloodlust : public SpellScriptLoader { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_SATED) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_INSANITY) - || !sSpellMgr->GetSpellInfo(SPELL_MAGE_TEMPORAL_DISPLACEMENT)) + || !sSpellMgr->GetSpellInfo(SPELL_MAGE_TEMPORAL_DISPLACEMENT) + || !sSpellMgr->GetSpellInfo(SPELL_PET_NETHERWINDS_FATIGUED)) return false; return true; } @@ -671,7 +673,8 @@ class spell_sha_heroism : public SpellScriptLoader { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_EXHAUSTION) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_INSANITY) - || !sSpellMgr->GetSpellInfo(SPELL_MAGE_TEMPORAL_DISPLACEMENT)) + || !sSpellMgr->GetSpellInfo(SPELL_MAGE_TEMPORAL_DISPLACEMENT) + || !sSpellMgr->GetSpellInfo(SPELL_PET_NETHERWINDS_FATIGUED)) return false; return true; } |