Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-30 13:47:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Scripts: fixed npc immunity flags during Harbinger Skyriss encounter

Browse Source 
- Added missing _Reset
- Properly register Skyriss summons in SummonList

Closes #21154

Who ordered up an extra large can of whoop-ass?

(cherry picked from commit f8b148c334)
This commit is contained in:
ariel-
2018-01-02 03:18:22 -03:00
committed by funjoker
parent 87d5544f05
commit f77bd1e7c9
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
View File

@@ -106,7 +106,10 @@ class npc_millhouse_manastorm : public CreatureScript
Initialize();
if (instance->GetData(DATA_WARDEN_2) == DONE)
{
Init = true;
me->SetImmuneToNPC(false);
}
if (instance->GetBossState(DATA_HARBINGER_SKYRISS) == DONE)
Talk(SAY_COMPLETE);
@@ -178,6 +181,7 @@ class npc_millhouse_manastorm : public CreatureScript
case 7:
instance->SetData(DATA_WARDEN_2, DONE);
Init = true;
me->SetImmuneToNPC(false);
break;
}
++Phase;

10
src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
View File

@@ -98,9 +98,9 @@ class boss_harbinger_skyriss : public CreatureScript
void Reset() override
{
if (!Intro)
me->SetImmuneToPC(true);
_Reset();
me->SetImmuneToAll(!Intro);
Initialize();
}
@@ -131,6 +131,9 @@ class boss_harbinger_skyriss : public CreatureScript
if (me->GetVictim())
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
summon->AI()->AttackStart(target);
summons.Summon(summon);
summon->SetImmuneToAll(false);
}
void KilledUnit(Unit* victim) override
@@ -182,7 +185,7 @@ class boss_harbinger_skyriss : public CreatureScript
Intro_Timer = 3000;
break;
case 3:
me->SetImmuneToPC(false);
me->SetImmuneToAll(false);
Intro = true;
break;
}
@@ -286,6 +289,7 @@ class boss_harbinger_skyriss_illusion : public CreatureScript
void Reset() override
{
me->SetImmuneToPC(false);
me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
}