diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-14 13:36:07 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-14 13:36:07 +0200 |
| commit | c8b722e4a44195ab757f0b4d454f92767d65d45f (patch) | |
| tree | 3c845a82da62a0f02900a5bad14845bae0d61f60 /src/server/game | |
| parent | 617e0c476be9bce7a1ae67ac95fdd6a572027c54 (diff) | |
Scripted/BaradinHold: Implemented Occu'thar
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Scripting/ScriptLoader.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp index dbed7d990b5..8d155badd6d 100644 --- a/src/server/game/Scripting/ScriptLoader.cpp +++ b/src/server/game/Scripting/ScriptLoader.cpp @@ -102,6 +102,7 @@ void AddSC_boss_drekthar(); void AddSC_boss_galvangar(); void AddSC_boss_vanndar(); void AddSC_boss_alizabal(); //Baradin Hold +void AddSC_boss_occuthar(); void AddSC_boss_pit_lord_argaloth(); void AddSC_instance_baradin_hold(); void AddSC_blackrock_depths(); //Blackrock Depths @@ -762,6 +763,7 @@ void AddEasternKingdomsScripts() AddSC_boss_galvangar(); AddSC_boss_vanndar(); AddSC_boss_alizabal(); //Baradin Hold + AddSC_boss_occuthar(); AddSC_boss_pit_lord_argaloth(); AddSC_instance_baradin_hold(); AddSC_blackrock_depths(); //Blackrock Depths diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 08b44c933bc..0fb463f222c 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1172,7 +1172,7 @@ bool SpellInfo::NeedsExplicitUnitTarget() const bool SpellInfo::NeedsToBeTriggeredByCaster() const { - if (NeedsExplicitUnitTarget()) + if (NeedsExplicitUnitTarget() || Id == 96946 || Id == 101005) return true; for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) { diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 0b1ad422a21..c6aba4853ee 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -3754,6 +3754,10 @@ void SpellMgr::LoadSpellInfoCorrections() // Crashes client on pressing ESC spellInfo->AttributesEx4 &= ~SPELL_ATTR4_TRIGGERED; break; + case 96942: // Gaze of Occu'thar + case 101009: // Gaze of Occu'thar + spellInfo->AttributesEx &= ~SPELL_ATTR1_CHANNELED_1; + break; default: break; } |