diff options
Diffstat (limited to 'src/server/scripts')
50 files changed, 124 insertions, 132 deletions
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp index 0829e0d0e70..54e7a8d75df 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp @@ -342,7 +342,7 @@ public: //Teleport self to a hiding spot (this causes errors in the Trinity log but no real issues) DoTeleportTo(HIDE_X,HIDE_Y,HIDE_Z); - me->addUnitState(UNIT_STAT_FLEEING); + me->AddUnitState(UNIT_STAT_FLEEING); //Spawn nef and have him attack a random target Creature* Nefarian = me->SummonCreature(CREATURE_NEFARIAN,NEF_X,NEF_Y,NEF_Z,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,120000); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index 84f8748d90a..9934878123f 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -393,7 +393,7 @@ public: EnfeebleResetTimer = 0; } else EnfeebleResetTimer -= diff; - if (me->hasUnitState(UNIT_STAT_STUNNED)) // While shifting to phase 2 malchezaar stuns himself + if (me->HasUnitState(UNIT_STAT_STUNNED)) // While shifting to phase 2 malchezaar stuns himself return; if (me->GetUInt64Value(UNIT_FIELD_TARGET) != me->getVictim()->GetGUID()) diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 9ba36803af7..1e7cbd118ad 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -425,7 +425,7 @@ public: { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->addUnitState(UNIT_STAT_STUNNED); + me->AddUnitState(UNIT_STAT_STUNNED); ScriptedAI::InitializeAI(); } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index 8bde996060b..ed0cddc92fc 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -151,7 +151,7 @@ public: summoned->CastSpell(summoned,SPELL_DARKFIEND_VISUAL,false); break; case CREATURE_DARKNESS: - summoned->addUnitState(UNIT_STAT_STUNNED); + summoned->AddUnitState(UNIT_STAT_STUNNED); float x,y,z,o; summoned->GetHomePosition(x,y,z,o); me->SummonCreature(CREATURE_DARK_FIENDS, x,y,z,o, TEMPSUMMON_CORPSE_DESPAWN, 0); @@ -401,7 +401,7 @@ public: InAction = false; SummonSentinel = false; - me->addUnitState(UNIT_STAT_STUNNED); + me->AddUnitState(UNIT_STAT_STUNNED); Summons.DespawnAll(); } @@ -475,7 +475,7 @@ public: WaitTimer = 2000; InAction = false; - me->addUnitState(UNIT_STAT_STUNNED); + me->AddUnitState(UNIT_STAT_STUNNED); } void SpellHit(Unit* /*caster*/, const SpellEntry* Spell) @@ -494,7 +494,7 @@ public: { if (!InAction) { - me->clearUnitState(UNIT_STAT_STUNNED); + me->ClearUnitState(UNIT_STAT_STUNNED); DoCastAOE(SPELL_DARKFIEND_SKIN, false); AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)); InAction = true; @@ -604,7 +604,7 @@ public: SpellTimer = 5000; Phase = 0; - me->addUnitState(UNIT_STAT_STUNNED); + me->AddUnitState(UNIT_STAT_STUNNED); DoCastAOE(SPELL_BLACKHOLE_SPAWN, true); } @@ -616,7 +616,7 @@ public: switch (NeedForAHack) { case 0: - me->clearUnitState(UNIT_STAT_STUNNED); + me->ClearUnitState(UNIT_STAT_STUNNED); DoCastAOE(SPELL_BLACKHOLE_GROW, false); if (Victim) AttackStart(Victim); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index 018af2b22b1..32dadcf802e 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -90,7 +90,7 @@ struct boss_twinemperorsAI : public ScriptedAI AfterTeleportTimer = 0; Abuse_Bug_Timer = 10000 + rand()%7000; BugsTimer = 2000; - me->clearUnitState(UNIT_STAT_STUNNED); + me->ClearUnitState(UNIT_STAT_STUNNED); DontYellWhenDead = false; EnrageTimer = 15*60000; } @@ -237,7 +237,7 @@ struct boss_twinemperorsAI : public ScriptedAI DoStopAttack(); DoResetThreat(); DoCast(me, SPELL_TWIN_TELEPORT_VISUAL); - me->addUnitState(UNIT_STAT_STUNNED); + me->AddUnitState(UNIT_STAT_STUNNED); AfterTeleport = true; AfterTeleportTimer = 2000; tspellcasted = false; @@ -249,9 +249,9 @@ struct boss_twinemperorsAI : public ScriptedAI { if (!tspellcasted) { - me->clearUnitState(UNIT_STAT_STUNNED); + me->ClearUnitState(UNIT_STAT_STUNNED); DoCast(me, SPELL_TWIN_TELEPORT); - me->addUnitState(UNIT_STAT_STUNNED); + me->AddUnitState(UNIT_STAT_STUNNED); } tspellcasted = true; @@ -259,7 +259,7 @@ struct boss_twinemperorsAI : public ScriptedAI if (AfterTeleportTimer <= diff) { AfterTeleport = false; - me->clearUnitState(UNIT_STAT_STUNNED); + me->ClearUnitState(UNIT_STAT_STUNNED); if (Unit *nearu = me->SelectNearestTarget(100)) { //DoYell(nearu->GetName(), LANG_UNIVERSAL, 0); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 8dbafb69b83..59beeb1279f 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -271,7 +271,7 @@ public: if (((uiUndergroundPhase == 0 && HealthBelowPct(75)) || (uiUndergroundPhase == 1 && HealthBelowPct(50)) || (uiUndergroundPhase == 2 && HealthBelowPct(25))) - && !me->hasUnitState(UNIT_STAT_CASTING)) + && !me->HasUnitState(UNIT_STAT_CASTING)) { bGuardianSummoned = false; bVenomancerSummoned = false; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index 9806103e17d..710275030fe 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -109,7 +109,7 @@ public: { RemoveSummons(); me->SetDisplayId(me->GetNativeDisplayId()); - me->clearUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); + me->ClearUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); bEventInProgress = false; bEvent = false; @@ -165,7 +165,7 @@ public: uiPhase++; uiResurrectTimer = 4000; bEventInProgress = false; - me->clearUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); + me->ClearUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); } else uiResurrectTimer -= uiDiff; } @@ -209,14 +209,14 @@ public: if (!bSummonArmy) { bSummonArmy = true; - me->addUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); + me->AddUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); DoCast(me, SPELL_ARMY_DEAD); } if (!bDeathArmyDone) { if (uiDeathArmyCheckTimer <= uiDiff) { - me->clearUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); + me->ClearUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); uiDeathArmyCheckTimer = 0; bDeathArmyDone = true; } else uiDeathArmyCheckTimer -= uiDiff; @@ -261,7 +261,7 @@ public: } } - if (!me->hasUnitState(UNIT_STAT_ROOT) && !me->HealthBelowPct(1)) + if (!me->HasUnitState(UNIT_STAT_ROOT) && !me->HealthBelowPct(1)) DoMeleeAttackIfReady(); } @@ -271,7 +271,7 @@ public: { uiDamage = 0; me->SetHealth(0); - me->addUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); + me->AddUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); RemoveSummons(); switch(uiPhase) { diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 52fd32b2498..511f2350670 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -138,7 +138,7 @@ class boss_bronjahm : public CreatureScript events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index b1d5f3478b8..22d2e0ab508 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -248,7 +248,7 @@ class boss_devourer_of_souls : public CreatureScript events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp index 8a178407a86..abb7d48cb7f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -441,7 +441,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -497,7 +497,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -555,7 +555,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -612,7 +612,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -672,7 +672,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -738,7 +738,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -811,7 +811,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -878,7 +878,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index d734fa671f6..1e5ae5b9bb3 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -103,7 +103,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; switch (events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index 2ba029bb2d1..aaefbf49f08 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -100,7 +100,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; switch (events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 72fc965c170..96f36928192 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -657,7 +657,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -740,7 +740,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -840,7 +840,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -910,7 +910,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -976,7 +976,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp index 8d782d6a14d..af2e12d6e1a 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -177,7 +177,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 810c61be823..a69238bbb2b 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -204,7 +204,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; switch(events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index 5805363127e..dc838462f7f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -160,7 +160,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -237,7 +237,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index b5cdc6d2877..ef7457ec70f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -186,7 +186,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -244,7 +244,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -306,7 +306,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -373,7 +373,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -432,7 +432,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -499,7 +499,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -561,7 +561,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -624,7 +624,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -689,7 +689,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -745,7 +745,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -803,7 +803,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -868,7 +868,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -930,7 +930,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -988,7 +988,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -1050,7 +1050,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -1108,7 +1108,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 11b039e6cad..d446933d2fb 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -66,7 +66,7 @@ public: if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE)) me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->clearUnitState(UNIT_STAT_STUNNED | UNIT_STAT_ROOT); + me->ClearUnitState(UNIT_STAT_STUNNED | UNIT_STAT_ROOT); me->SetReactState(REACT_PASSIVE); MightyBlowTimer = 10*IN_MILLISECONDS; bHealth = false; @@ -86,14 +86,14 @@ public: if (bRestore) { - pWho->clearUnitState(UNIT_STAT_STUNNED | UNIT_STAT_ROOT); + pWho->ClearUnitState(UNIT_STAT_STUNNED | UNIT_STAT_ROOT); pWho->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); if (pWho == me) me->RemoveAura(SPELL_FREEZE_ANIM); }else { pWho->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pWho->addUnitState(UNIT_STAT_STUNNED | UNIT_STAT_ROOT); + pWho->AddUnitState(UNIT_STAT_STUNNED | UNIT_STAT_ROOT); if (pWho == me) DoCast(me,SPELL_FREEZE_ANIM); } @@ -127,7 +127,7 @@ public: MightyBlowTimer = 10*IN_MILLISECONDS; } else MightyBlowTimer -= diff; - if (!me->hasUnitState(UNIT_STAT_STUNNED)) + if (!me->HasUnitState(UNIT_STAT_STUNNED)) DoMeleeAttackIfReady(); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index 495b8e68c93..63e3f18002f 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -152,7 +152,7 @@ public: DoScriptText(SAY_TRANSFORM_1, me); uiTransformationTimer = 5*IN_MILLISECONDS; bStartOfTransformation = true; - me->clearUnitState(UNIT_STAT_STUNNED|UNIT_STAT_ROOT); + me->ClearUnitState(UNIT_STAT_STUNNED|UNIT_STAT_ROOT); me->SetReactState(REACT_AGGRESSIVE); } else @@ -162,7 +162,7 @@ public: if (bStartOfTransformation) { bStartOfTransformation = false; - me->addUnitState(UNIT_STAT_STUNNED|UNIT_STAT_ROOT); + me->AddUnitState(UNIT_STAT_STUNNED|UNIT_STAT_ROOT); me->SetReactState(REACT_PASSIVE); } } @@ -195,7 +195,7 @@ public: DoScriptText(SAY_TRANSFORM_2, me); uiTransformationTimer = 9*IN_MILLISECONDS; bStartOfTransformation = true; - me->clearUnitState(UNIT_STAT_STUNNED|UNIT_STAT_ROOT); + me->ClearUnitState(UNIT_STAT_STUNNED|UNIT_STAT_ROOT); me->SetReactState(REACT_AGGRESSIVE); } else @@ -205,7 +205,7 @@ public: if (bStartOfTransformation) { bStartOfTransformation = false; - me->addUnitState(UNIT_STAT_STUNNED|UNIT_STAT_ROOT); + me->AddUnitState(UNIT_STAT_STUNNED|UNIT_STAT_ROOT); me->SetReactState(REACT_PASSIVE); } } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index adf51f7fb1c..cc2267a7505 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -278,7 +278,7 @@ class boss_blood_council_controller : public CreatureScript events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -485,7 +485,7 @@ class boss_prince_keleseth_icc : public CreatureScript events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -679,7 +679,7 @@ class boss_prince_taldaram_icc : public CreatureScript events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -892,7 +892,7 @@ class boss_prince_valanar_icc : public CreatureScript events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -1089,7 +1089,7 @@ class npc_ball_of_flame : public CreatureScript if (Player* target = ObjectAccessor::GetPlayer(*me, chaseGUID)) { // need to clear states now because this call is before AuraEffect is fully removed - me->clearUnitState(UNIT_STAT_CASTING | UNIT_STAT_STUNNED); + me->ClearUnitState(UNIT_STAT_CASTING | UNIT_STAT_STUNNED); if (target && me->Attack(target, true)) me->GetMotionMaster()->MoveChase(target, 1.0f); } @@ -1214,7 +1214,7 @@ class npc_dark_nucleus : public CreatureScript } DoCast(who, SPELL_SHADOW_RESONANCE_RESIST); - me->clearUnitState(UNIT_STAT_CASTING); + me->ClearUnitState(UNIT_STAT_CASTING); } void MoveInLineOfSight(Unit* who) @@ -1248,7 +1248,7 @@ class npc_dark_nucleus : public CreatureScript !victim->HasAura(SPELL_SHADOW_RESONANCE_RESIST, me->GetGUID())) { DoCast(victim, SPELL_SHADOW_RESONANCE_RESIST); - me->clearUnitState(UNIT_STAT_CASTING); + me->ClearUnitState(UNIT_STAT_CASTING); } } else @@ -1267,7 +1267,7 @@ class npc_dark_nucleus : public CreatureScript lockedTarget = true; AttackStart(victim); DoCast(victim, SPELL_SHADOW_RESONANCE_RESIST); - me->clearUnitState(UNIT_STAT_CASTING); + me->ClearUnitState(UNIT_STAT_CASTING); } } } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 4dcea50624a..7632752f5a4 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -237,7 +237,7 @@ class boss_blood_queen_lana_thel : public CreatureScript events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 38f7811a1d1..b922c95c511 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -392,7 +392,7 @@ class boss_deathbringer_saurfang : public CreatureScript events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index 8a9ec1d9f71..086bd0547bf 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -176,7 +176,7 @@ class boss_festergut : public CreatureScript events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -307,7 +307,7 @@ class npc_stinky_icc : public CreatureScript events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index cdf8d39cf3f..29c772f9a10 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -345,7 +345,7 @@ class boss_lady_deathwhisper : public CreatureScript events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING) && !(events.GetPhaseMask() & PHASE_INTRO_MASK)) + if (me->HasUnitState(UNIT_STAT_CASTING) && !(events.GetPhaseMask() & PHASE_INTRO_MASK)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -592,7 +592,7 @@ class npc_cult_fanatic : public CreatureScript events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -670,7 +670,7 @@ class npc_cult_adherent : public CreatureScript events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index 78a3e2f44a4..45c647cbaa8 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -156,7 +156,7 @@ class boss_lord_marrowgar : public CreatureScript events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -532,8 +532,4 @@ void AddSC_boss_lord_marrowgar() new spell_marrowgar_coldflame(); new spell_marrowgar_bone_spike_graveyard(); new spell_marrowgar_bone_storm(); - - // has to be done or else players threat will be wiped for impaled player and he will absorb all damage - if (VehicleSeatEntry* vehSeat = const_cast<VehicleSeatEntry*>(sVehicleSeatStore.LookupEntry(6206))) - vehSeat->m_flags |= 0x400; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 690efd690de..f88274ca956 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -267,7 +267,7 @@ class boss_professor_putricide : public CreatureScript { summon->AI()->AttackStart(target); summon->CastCustomSpell(SPELL_GASEOUS_BLOAT, SPELLVALUE_MAX_TARGETS, 1, target, false); - summon->clearUnitState(UNIT_STAT_CASTING); + summon->ClearUnitState(UNIT_STAT_CASTING); summon->GetMotionMaster()->MoveIdle(); summon->m_Events.AddEvent(new StartMovementEvent(*summon), summon->m_Events.CalculateTime(3500)); } @@ -280,7 +280,7 @@ class boss_professor_putricide : public CreatureScript { summon->AI()->AttackStart(target); summon->CastCustomSpell(SPELL_VOLATILE_OOZE_ADHESIVE, SPELLVALUE_MAX_TARGETS, 1, target, false); - summon->clearUnitState(UNIT_STAT_CASTING); + summon->ClearUnitState(UNIT_STAT_CASTING); summon->GetMotionMaster()->MoveIdle(); summon->m_Events.AddEvent(new StartMovementEvent(*summon), summon->m_Events.CalculateTime(3500)); } @@ -524,7 +524,7 @@ class boss_professor_putricide : public CreatureScript events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index 359b67232aa..a2f7b3b3a21 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -184,7 +184,7 @@ class boss_rotface : public CreatureScript events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -410,7 +410,7 @@ class npc_precious_icc : public CreatureScript events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index ecdb6dd8599..900b56f1dc5 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -129,7 +129,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 3a709787ff9..f20fc61bc9d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -342,7 +342,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 7aa4b0a9acd..d062d6589fd 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -396,7 +396,7 @@ public: instance->SetData(DATA_GOTHIK_GATE, GO_STATE_ACTIVE); } - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index e22a372fd39..7f9c32cd2a6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -476,7 +476,7 @@ public: else uiGuardiansOfIcecrownTimer -= diff; } - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; if (uint32 eventId = events.GetEvent()) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 0da7c1e586c..69c2983dbf1 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -224,7 +224,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp index 5ac7ef1db8f..ca51b318716 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp @@ -397,11 +397,11 @@ public: if (me->HasAura(SPELL_SYSTEMS_SHUTDOWN)) { me->SetReactState(REACT_PASSIVE); - me->addUnitState(UNIT_STAT_STUNNED | UNIT_STAT_ROOT); + me->AddUnitState(UNIT_STAT_STUNNED | UNIT_STAT_ROOT); return; } - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; if (me->HasAura(SPELL_SYSTEMS_SHUTDOWN)) @@ -466,7 +466,7 @@ public: break; case EVENT_REPAIR: me->MonsterTextEmote(EMOTE_REPAIR, 0, true); - me->clearUnitState(UNIT_STAT_STUNNED | UNIT_STAT_ROOT); + me->ClearUnitState(UNIT_STAT_STUNNED | UNIT_STAT_ROOT); InstallAdds(false); events.CancelEvent(EVENT_REPAIR); break; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp index 8e97087ae49..bb33d9efdeb 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp @@ -192,7 +192,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; EncounterTime += diff; @@ -482,8 +482,4 @@ void AddSC_boss_ignis() new npc_iron_construct(); new npc_scorch_ground(); new spell_ignis_slag_pot(); - - // has to be done or else players wil absorb dmg from slag pot vehicle seat 1 slagpot - if (VehicleSeatEntry* vehSeat = const_cast<VehicleSeatEntry*>(sVehicleSeatStore.LookupEntry(3206))) - vehSeat->m_flags |= 0x400; } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp index 7095e4cde1f..0a9071b2535 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp @@ -126,7 +126,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; // TODO: because we are using hack, he is stunned and cannot cast, so we use triggered for every spell diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index 4d137dcf37e..4167061f585 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -206,7 +206,7 @@ public: if (uiCleaveTimer <= diff) { - if (!me->hasUnitState(UNIT_STAT_CASTING)) + if (!me->HasUnitState(UNIT_STAT_CASTING)) { if (bIsUndead) DoCast(me->getVictim(), SPELL_WOE_STRIKE); @@ -218,7 +218,7 @@ public: if (uiSmashTimer <= diff) { - if (!me->hasUnitState(UNIT_STAT_CASTING)) + if (!me->HasUnitState(UNIT_STAT_CASTING)) { if (bIsUndead) DoCast(me->getVictim(), SPELL_DARK_SMASH); @@ -239,7 +239,7 @@ public: { if (uiEnrageTimer <= diff) { - if (!me->hasUnitState(UNIT_STAT_CASTING)) + if (!me->HasUnitState(UNIT_STAT_CASTING)) { // Spawn target for Axe Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 1); @@ -256,7 +256,7 @@ public: if (uiRoarTimer <= diff) { - if (!me->hasUnitState(UNIT_STAT_CASTING)) + if (!me->HasUnitState(UNIT_STAT_CASTING)) { if (bIsUndead) DoCast(me, SPELL_DREADFUL_ROAR); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index 3155b8d0cb3..aa8f601e756 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -105,7 +105,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index 3b59dee2108..e69389938e1 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -117,7 +117,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) @@ -226,7 +226,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; if (Aura *overchargedAura = me->GetAura(SPELL_OVERCHARGED)) diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp index 2f4e9daec61..9672d2a5718 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp @@ -116,7 +116,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index 37327256e64..83ffa1f6a21 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -103,7 +103,7 @@ public: events.Update(diff); - if (me->hasUnitState(UNIT_STAT_CASTING)) + if (me->HasUnitState(UNIT_STAT_CASTING)) return; while (uint32 eventId = events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index 413e4192144..1957f718969 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -1328,7 +1328,7 @@ public: if (uiType != POINT_MOTION_TYPE) return; - me->addUnitState(UNIT_STAT_STUNNED); + me->AddUnitState(UNIT_STAT_STUNNED); me->CastSpell(me, SPELL_STUN, true); if (me->isSummon()) if (Unit* pSummoner = CAST_SUM(me)->GetSummoner()) @@ -1445,7 +1445,7 @@ public: DoScriptText(SAY_LERYSSA_1, pLeryssa); pArlos->Kill(pArlos, false); pLeryssa->RemoveAura(SPELL_STUN); - pLeryssa->clearUnitState(UNIT_STAT_STUNNED); + pLeryssa->ClearUnitState(UNIT_STAT_STUNNED); pLeryssa->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); pLeryssa->GetMotionMaster()->MovePoint(0,3722.114502f, 3564.201660f, 477.441437f); @@ -1495,7 +1495,7 @@ public: if (Creature* pTalbot = me->FindNearestCreature(NPC_PRINCE_VALANAR, 50.0f, true)) CAST_AI(npc_counselor_talbot::npc_counselor_talbotAI, pTalbot->AI())->bCheck = true; - me->addUnitState(UNIT_STAT_STUNNED); + me->AddUnitState(UNIT_STAT_STUNNED); me->CastSpell(me, SPELL_STUN, true); if (me->isSummon()) diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index 90e86e3667c..7642c50947a 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -82,7 +82,7 @@ public: summoned->CastSpell(summoned,SPELL_FOCUS_FIRE_VISUAL,false); summoned->setFaction(me->getFaction()); summoned->SetLevel(me->getLevel()); - summoned->addUnitState(UNIT_STAT_ROOT); + summoned->AddUnitState(UNIT_STAT_ROOT); if (Unit *pFocusedTarget = Unit::GetUnit(*me, FocusedTargetGUID)) summoned->AI()->AttackStart(pFocusedTarget); diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index bb5e2482239..6a397da3909 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -337,7 +337,7 @@ class boss_vazruden_the_herald : public CreatureScript VazrudenGUID = 0; } summoned = false; - me->clearUnitState(UNIT_STAT_ROOT); + me->ClearUnitState(UNIT_STAT_ROOT); me->SetVisible(true); } } @@ -352,7 +352,7 @@ class boss_vazruden_the_herald : public CreatureScript NazanGUID = Nazan->GetGUID(); summoned = true; me->SetVisible(false); - me->addUnitState(UNIT_STAT_ROOT); + me->AddUnitState(UNIT_STAT_ROOT); } } diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index c68cf80a530..fd48b0ff7e6 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -267,7 +267,7 @@ class boss_magtheridon : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - me->addUnitState(UNIT_STAT_STUNNED); + me->AddUnitState(UNIT_STAT_STUNNED); DoCast(me, SPELL_SHADOW_CAGE_C, true); } @@ -348,7 +348,7 @@ class boss_magtheridon : public CreatureScript void AttackStart(Unit *who) { - if (!me->hasUnitState(UNIT_STAT_STUNNED)) + if (!me->HasUnitState(UNIT_STAT_STUNNED)) ScriptedAI::AttackStart(who); } @@ -402,7 +402,7 @@ class boss_magtheridon : public CreatureScript if (BlastNova_Timer <= diff) { // to avoid earthquake interruption - if (!me->hasUnitState(UNIT_STAT_STUNNED)) + if (!me->HasUnitState(UNIT_STAT_STUNNED)) { DoScriptText(EMOTE_BLASTNOVA, me); DoCast(me, SPELL_BLASTNOVA); @@ -445,7 +445,7 @@ class boss_magtheridon : public CreatureScript if (!Phase3 && HealthBelowPct(30) && !me->IsNonMeleeSpellCasted(false) // blast nova - && !me->hasUnitState(UNIT_STAT_STUNNED)) // shadow cage and earthquake + && !me->HasUnitState(UNIT_STAT_STUNNED)) // shadow cage and earthquake { Phase3 = true; DoScriptText(SAY_CHAMBER_DESTROY, me); diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp index c44c0db6c33..6980d9ca5ef 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -224,7 +224,7 @@ class instance_magtheridons_lair : public InstanceMapScript Creature* Magtheridon = instance->GetCreature(MagtheridonGUID); if (Magtheridon && Magtheridon->isAlive()) { - Magtheridon->clearUnitState(UNIT_STAT_STUNNED); + Magtheridon->ClearUnitState(UNIT_STAT_STUNNED); Magtheridon->AI()->AttackStart(Magtheridon->SelectNearestTarget(999)); } CageTimer = 0; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index a62941ef49c..332658d97d0 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -398,7 +398,7 @@ class boss_kaelthas : public CreatureScript void MoveInLineOfSight(Unit *who) { - if (!me->hasUnitState(UNIT_STAT_STUNNED) && who->isTargetableForAttack() && + if (!me->HasUnitState(UNIT_STAT_STUNNED) && who->isTargetableForAttack() && me->IsHostileTo(who) && who->isInAccessiblePlaceFor(me)) { if (!me->canFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp index ff5d8026cee..91f2d4308c1 100644 --- a/src/server/scripts/Outland/netherstorm.cpp +++ b/src/server/scripts/Outland/netherstorm.cpp @@ -798,7 +798,7 @@ public: Materialize = true; } - if (me->HasAuraType(SPELL_AURA_MOD_DECREASE_SPEED) || me->hasUnitState(UNIT_STAT_ROOT)) // if the mob is rooted/slowed by spells eg.: Entangling Roots, Frost Nova, Hamstring, Crippling Poison, etc. => remove it + if (me->HasAuraType(SPELL_AURA_MOD_DECREASE_SPEED) || me->HasUnitState(UNIT_STAT_ROOT)) // if the mob is rooted/slowed by spells eg.: Entangling Roots, Frost Nova, Hamstring, Crippling Poison, etc. => remove it DoCast(me, SPELL_PHASE_SLIP); if (!UpdateVictim()) diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp index 66ccb80a3c2..f4d6cd4a687 100644 --- a/src/server/scripts/Outland/shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/shadowmoon_valley.cpp @@ -1258,7 +1258,7 @@ public: AggroTargetGUID = 0; Timers = false; - me->addUnitState(UNIT_STAT_ROOT); + me->AddUnitState(UNIT_STAT_ROOT); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SetUInt64Value(UNIT_FIELD_TARGET, 0); } @@ -1302,7 +1302,7 @@ public: if (Player* AggroTarget = (Unit::GetPlayer(*me, AggroTargetGUID))) { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->clearUnitState(UNIT_STAT_ROOT); + me->ClearUnitState(UNIT_STAT_ROOT); float x, y, z; AggroTarget->GetPosition(x,y,z); diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 44c21a26932..834c32d0528 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -223,7 +223,7 @@ public: { Unit* pTarget = aurApp->GetTarget(); pTarget->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - pTarget->addUnitState(UNIT_STAT_ROOT); + pTarget->AddUnitState(UNIT_STAT_ROOT); } void HandleEffectRemove(AuraEffect const * /*aurEff*/, AuraApplication const * aurApp, AuraEffectHandleModes /*mode*/) diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 66b8e400a71..2fe252ff098 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -1873,7 +1873,7 @@ public: Unit *owner = me->GetCharmerOrOwner(); me->CombatStop(true); - if (owner && !me->hasUnitState(UNIT_STAT_FOLLOW)) + if (owner && !me->HasUnitState(UNIT_STAT_FOLLOW)) { me->GetMotionMaster()->Clear(false); me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, me->GetFollowAngle(), MOTION_SLOT_ACTIVE); @@ -2056,7 +2056,7 @@ public: if (!UpdateVictim()) return; - if (!me->hasUnitState(UNIT_STAT_STUNNED)) + if (!me->HasUnitState(UNIT_STAT_STUNNED)) me->SetControlled(true,UNIT_STAT_STUNNED);//disable rotate if (uiEntry != NPC_ADVANCED_TARGET_DUMMY && uiEntry != NPC_TARGET_DUMMY) |