Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-26 11:52:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Creature: move MakeInterruptable helper to creature class to make it accessible from all places with no multiple definitions

Browse Source
This commit is contained in:
Ovahlord
2018-04-04 02:19:45 +02:00
parent c702437d32
commit 990defbdd8
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp
View File

@@ -105,7 +105,7 @@ public:
_achievementEnabled = true;
me->SetReactState(REACT_PASSIVE);
me->SetPower(POWER_ENERGY, 100);
MakeInterruptable(false);
me->MakeInterruptable(false);
}
void JustEngagedWith(Unit* /*who*/) override
@@ -127,7 +127,7 @@ public:
if (summon->GetEntry() == NPC_INFERNO_LEAP)
{
MakeInterruptable(true);
me->MakeInterruptable(true);
events.ScheduleEvent(EVENT_INFERNO_LEAP, 1);
events.ScheduleEvent(EVENT_APPLY_IMMUNITY, Seconds(1) + Milliseconds(500));
}
@@ -150,22 +150,16 @@ public:
{
_EnterEvadeMode();
summons.DespawnAll();
MakeInterruptable(false);
instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me);
_DespawnAtEvade();
}
void OnSpellCastInterrupt(SpellInfo const* /*spell*/) override
{
MakeInterruptable(false);
me->MakeInterruptable(false);
events.CancelEvent(EVENT_APPLY_IMMUNITY);
}
void MakeInterruptable(bool apply)
{
me->ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_INTERRUPT, !apply);
me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_INTERRUPT_CAST, !apply);
}
uint32 GetData(uint32 type) const override
{
switch (type)
@@ -225,7 +219,7 @@ public:
DoCastSelf(SPELL_SOLAR_WINDS_SUMMON);
break;
case EVENT_SUMMON_SUN_ORB:
MakeInterruptable(true);
me->MakeInterruptable(true);
me->StopMoving();
DoCastSelf(SPELL_SUMMON_SUN_ORB);
events.Repeat(_randomTimerCase == 0 ? Seconds(35), Seconds(36) : Seconds(31), Seconds(37));
@@ -237,7 +231,7 @@ public:
events.Repeat(_randomTimerCase == 0 ? Seconds(35) : Seconds(27));
break;
case EVENT_APPLY_IMMUNITY:
MakeInterruptable(false);
me->MakeInterruptable(false);
break;
case EVENT_MOVE_TO_MIDDLE:
events.Reset();