aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeader <keader.android@gmail.com>2017-01-21 11:03:26 -0300
committerKeader <keader.android@gmail.com>2017-01-21 11:03:26 -0300
commit591a25500d98a17eaf70215329080ca2f41783ed (patch)
tree2fdef040f97d78b30204298b0600f512fca249ef
parent44388bc8fb7d51c2454372d40a4c929b887ee668 (diff)
Core/Scripts: Fixed Crok event not starting
[*] Fixed Svalna entering in combat with people ouside of room Closes #8186
-rw-r--r--sql/updates/world/3.3.5/2017_01_21_00_world.sql2
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp3
2 files changed, 5 insertions, 0 deletions
diff --git a/sql/updates/world/3.3.5/2017_01_21_00_world.sql b/sql/updates/world/3.3.5/2017_01_21_00_world.sql
new file mode 100644
index 00000000000..8e85edf00e3
--- /dev/null
+++ b/sql/updates/world/3.3.5/2017_01_21_00_world.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `unit_flags`=512 WHERE `entry`=37129; -- Crok
+UPDATE `creature_addon` SET `auras`=70203 WHERE `guid`=137753; -- Svalna
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
index 790783e68a1..733c381271f 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
@@ -130,6 +130,7 @@ enum Spells
SPELL_IMPALING_SPEAR = 71443,
SPELL_AETHER_SHIELD = 71463,
SPELL_HURL_SPEAR = 71466,
+ SPELL_DIVINE_SURGE = 71465,
// Captain Arnath
SPELL_DOMINATE_MIND = 14515,
@@ -776,6 +777,7 @@ class boss_sister_svalna : public CreatureScript
_EnterCombat();
if (Creature* crok = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_CROK_SCOURGEBANE)))
crok->AI()->Talk(SAY_CROK_COMBAT_SVALNA);
+ DoCastSelf(SPELL_DIVINE_SURGE, true);
events.ScheduleEvent(EVENT_SVALNA_COMBAT, 9000);
events.ScheduleEvent(EVENT_IMPALING_SPEAR, urand(40000, 50000));
events.ScheduleEvent(EVENT_AETHER_SHIELD, urand(100000, 110000));
@@ -1029,6 +1031,7 @@ class npc_crok_scourgebane : public CreatureScript
{
// pause pathing until trash pack is cleared
case 0:
+ me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC);
Talk(SAY_CROK_COMBAT_WP_0);
if (!_aliveTrash.empty())
SetEscortPaused(true);