Core/Units: Reduce differences between branches part 1 - unit updatefield accessors

5 files changed, 36 insertions, 36 deletions

diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
index d65918dc117..27df691b571 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -158,10 +158,10 @@ struct boss_alar : public BossAI
 
         me->SetDisplayId(me->GetNativeDisplayId());
         me->SetSpeedRate(MOVE_RUN, DefaultMoveSpeedRate);
-        //me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10);
-        //me->SetFloatValue(UNIT_FIELD_COMBATREACH, 10);
+        //me->SetBoundingRadius(10);
+        //me->SetCombatReach(10);
         me->SetDisableGravity(true);
-        me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+        me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
         me->setActive(false);
     }
 
@@ -201,7 +201,7 @@ struct boss_alar : public BossAI
                 me->SetHealth(0);
                 me->InterruptNonMeleeSpells(true);
                 me->RemoveAllAuras();
-                me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
                 me->AttackStop();
                 me->SetTarget(ObjectGuid::Empty);
                 me->SetSpeedRate(MOVE_RUN, 5.0f);
@@ -287,7 +287,7 @@ struct boss_alar : public BossAI
                         me->SetStandState(UNIT_STAND_STATE_STAND);
                         me->SetFullHealth();
                         me->SetSpeedRate(MOVE_RUN, DefaultMoveSpeedRate);
-                        me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                        me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
                         DoZoneInCombat();
                         DoCast(me, SPELL_REBIRTH, true);
                         MeltArmor_Timer = 60000;
@@ -327,8 +327,8 @@ struct boss_alar : public BossAI
                     case WE_SUMMON:
                         for (uint8 i = 0; i < 2; ++i)
                             DoSpawnCreature(CREATURE_EMBER_OF_ALAR, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5s);
-                        me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10);
-                        me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNINTERACTIBLE);
+                        me->SetBoundingRadius(10);
+                        me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
                         me->SetDisplayId(me->GetNativeDisplayId());
                         DoCast(me, SPELL_REBIRTH_2, true);
                         break;
@@ -411,8 +411,8 @@ struct boss_alar : public BossAI
             {
                 me->AttackStop();
                 me->GetMotionMaster()->MovePoint(6, waypoint[4][0], waypoint[4][1], waypoint[4][2]);
-                me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNINTERACTIBLE);
-                me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 50);
+                me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
+                me->SetBoundingRadius(50);
                 WaitEvent = WE_METEOR;
                 WaitTimer = 0;
                 DiveBomb_Timer = 40000 + rand32() % 5000;
@@ -428,7 +428,7 @@ struct boss_alar : public BossAI
                     Creature* Summoned = me->SummonCreature(CREATURE_FLAME_PATCH_ALAR, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 2min);
                     if (Summoned)
                     {
-                        Summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNINTERACTIBLE);
+                        Summoned->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
                         Summoned->SetObjectScale(Summoned->GetObjectScale() * 2.5f);
                         Summoned->SetDisplayId(11686);
                         Summoned->SetFaction(me->GetFaction());
@@ -507,7 +507,7 @@ struct npc_ember_of_alar : public ScriptedAI
             damage = 0;
             DoCast(me, SPELL_EMBER_BLAST, true);
             me->SetDisplayId(11686);
-            me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNINTERACTIBLE);
+            me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
             if (instance->GetBossState(DATA_ALAR) == IN_PROGRESS)
             {
                 if (Unit* Alar = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_ALAR)))
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
index a1ef60e417f..b08a2aa1d49 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -141,7 +141,7 @@ struct boss_high_astromancer_solarian : public BossAI
         Initialize();
         _Reset();
         me->SetArmor(defaultarmor);
-        me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNINTERACTIBLE);
+        me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
         me->SetVisible(true);
         me->SetDisplayId(MODEL_HUMAN);
 
@@ -206,7 +206,7 @@ struct boss_high_astromancer_solarian : public BossAI
                 AppearDelay = false;
                 if (Phase == 2)
                 {
-                    me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNINTERACTIBLE);
+                    me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
                     me->SetVisible(false);
                 }
                 AppearDelay_Timer = 2s;
@@ -309,7 +309,7 @@ struct boss_high_astromancer_solarian : public BossAI
                 {
                     if (Creature* Summoned = me->SummonCreature(NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT, Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O, TEMPSUMMON_TIMED_DESPAWN, Phase2_Timer + Phase3_Timer + AppearDelay_Timer + 1700ms))
                     {
-                        Summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNINTERACTIBLE);
+                        Summoned->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
                         Summoned->CastSpell(Summoned, SPELL_SPOTLIGHT, false);
                     }
                 }
@@ -353,7 +353,7 @@ struct boss_high_astromancer_solarian : public BossAI
                     if (j != i)
                         SummonMinion(NPC_SOLARIUM_PRIEST, Portals[j][0], Portals[j][1], Portals[j][2]);
 
-                me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNINTERACTIBLE);
+                me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
                 me->SetVisible(true);
 
                 Talk(SAY_SUMMON2);
@@ -388,7 +388,7 @@ struct boss_high_astromancer_solarian : public BossAI
         {
             Phase = 4;
             //To make sure she wont be invisible or not selecatble
-            me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNINTERACTIBLE);
+            me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
             me->SetVisible(true);
             Talk(SAY_VOIDA);
             Talk(SAY_VOIDB);
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index e1694853c31..287837c796d 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -353,8 +353,8 @@ struct boss_kaelthas : public BossAI
     {
         Initialize();
         DoAction(ACTION_PREPARE_ADVISORS);
-        me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNINTERACTIBLE);
-        me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
+        me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
+        me->SetEmoteState(EMOTE_ONESHOT_NONE);
         me->SetDisableGravity(false);
         me->SetTarget(ObjectGuid::Empty);
         me->SetObjectScale(1.0f);
@@ -383,7 +383,7 @@ struct boss_kaelthas : public BossAI
         {
             case ACTION_START_ENCOUNTER:
                 Talk(SAY_INTRO);
-                me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNINTERACTIBLE);
+                me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
 
                 _advisorGuid[ADVISOR_THALADRED] = instance->GetGuidData(DATA_THALADRED);
                 _advisorGuid[ADVISOR_SANGUINAR] = instance->GetGuidData(DATA_SANGUINAR);
@@ -400,7 +400,7 @@ struct boss_kaelthas : public BossAI
                     if (Creature* creature = ObjectAccessor::GetCreature(*me, _advisorGuid[i]))
                     {
                         creature->Respawn(true);
-                        creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                        creature->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
                         creature->AI()->EnterEvadeMode();
                     }
                 }
@@ -502,7 +502,7 @@ struct boss_kaelthas : public BossAI
             case POINT_TRANSITION_CENTER_ASCENDING:
                 me->SetFacingTo(float(M_PI));
                 Talk(SAY_PHASE5_NUTS);
-                me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNINTERACTIBLE);
+                me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
                 me->SetDisableGravity(true);
                 //me->SetHover(true); -- Set in sniffs, but breaks his visual.
                 events.ScheduleEvent(EVENT_TRANSITION_2, 2s);
@@ -521,7 +521,7 @@ struct boss_kaelthas : public BossAI
             case POINT_END_TRANSITION:
                 me->SetReactState(REACT_AGGRESSIVE);
                 me->InterruptNonMeleeSpells(false);
-                me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNINTERACTIBLE);
+                me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
                 me->RemoveAurasDueToSpell(SPELL_FULLPOWER);
 
                 if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0))
@@ -575,13 +575,13 @@ struct boss_kaelthas : public BossAI
             switch (eventId)
             {
                 case EVENT_START_ENCOUNTER:
-                    me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED);
+                    me->SetUnitFlag(UNIT_FLAG_PACIFIED);
                     DoAction(ACTION_ACTIVE_ADVISOR);
                     break;
                 case EVENT_ACTIVE_ADVISOR:
                     if (Creature* advisor = ObjectAccessor::GetCreature(*me, _advisorGuid[_advisorCounter]))
                     {
-                        advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                        advisor->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
 
                         if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
                             advisor->AI()->AttackStart(target);
@@ -603,7 +603,7 @@ struct boss_kaelthas : public BossAI
                     // Sometimes people can collect Aggro in Phase 1-3. Reset threat before releasing Kael.
                     ResetThreatList();
 
-                    me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_PACIFIED);
+                    me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_PACIFIED);
 
                     if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
                         AttackStart(target);
@@ -636,7 +636,7 @@ struct boss_kaelthas : public BossAI
                     events.ScheduleEvent(EVENT_SUMMON_PHOENIX, 45s, 60s, EVENT_GROUP_COMBAT, PHASE_COMBAT);
                     break;
                 case EVENT_END_TRANSITION:
-                    me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
+                    me->SetEmoteState(EMOTE_ONESHOT_NONE);
                     DoCast(SPELL_FULLPOWER);
                     events.ScheduleEvent(EVENT_TRANSITION_4, 2s);
                     break;
@@ -701,7 +701,7 @@ struct boss_kaelthas : public BossAI
                     me->RemoveAurasDueToSpell(SPELL_NETHER_BEAM_VISUAL3);
                     DoCast(me, SPELL_KAEL_EXPLODES3, true);
                     DoCast(me, SPELL_KAEL_STUNNED); // Core doesn't handle the emote properly while flying.
-                    me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_DROWNED);
+                    me->SetEmoteState(EMOTE_STATE_DROWNED);
 
                     // Destroy the surrounding environment.
                     if (GameObject* statue = instance->GetGameObject(DATA_KAEL_STATUE_LEFT))
@@ -779,8 +779,8 @@ struct advisorbase_ai : public ScriptedAI
         Initialize();
 
         me->SetStandState(UNIT_STAND_STATE_STAND);
-        me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-        me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_STUNNED);
+        me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
+        me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_STUNNED);
 
         //reset encounter
         if (instance->GetBossState(DATA_KAELTHAS) == IN_PROGRESS)
@@ -790,7 +790,7 @@ struct advisorbase_ai : public ScriptedAI
 
     void MoveInLineOfSight(Unit* who) override
     {
-        if (!who || _inFakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+        if (!who || _inFakeDeath || me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE))
             return;
 
         ScriptedAI::MoveInLineOfSight(who);
@@ -798,7 +798,7 @@ struct advisorbase_ai : public ScriptedAI
 
     void AttackStart(Unit* who) override
     {
-        if (!who || _inFakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+        if (!who || _inFakeDeath || me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE))
             return;
 
         ScriptedAI::AttackStart(who);
@@ -809,7 +809,7 @@ struct advisorbase_ai : public ScriptedAI
         if (spellInfo->Id == SPELL_RESSURECTION)
         {
             _hasRessurrected = true;
-            me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_STUNNED);
+            me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_STUNNED);
             me->SetStandState(UNIT_STAND_STATE_STAND);
             events.ScheduleEvent(EVENT_DELAYED_RESSURECTION, 2s);
         }
@@ -829,7 +829,7 @@ struct advisorbase_ai : public ScriptedAI
             me->RemoveAllAurasOnDeath();
             me->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
             me->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
-            me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_STUNNED);
+            me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_STUNNED);
             me->SetTarget(ObjectGuid::Empty);
             me->SetStandState(UNIT_STAND_STATE_DEAD);
             me->GetMotionMaster()->Clear();
@@ -1059,7 +1059,7 @@ struct boss_grand_astromancer_capernian : public advisorbase_ai
 
     void AttackStart(Unit* who) override
     {
-        if (!who || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+        if (!who || me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE))
             return;
 
         if (me->Attack(who, true))
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
index 2df55af0b02..765d655a6c9 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
@@ -289,7 +289,7 @@ struct npc_warden_mellichar : public ScriptedAI
     {
         Initialize();
 
-        me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+        me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
         DoCast(me, SPELL_TARGET_OMEGA);
 
         instance->SetBossState(DATA_HARBINGER_SKYRISS, NOT_STARTED);
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
index da3ede6991c..df75ec83c98 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
@@ -274,7 +274,7 @@ struct boss_harbinger_skyriss_illusion : public ScriptedAI
     void Reset() override
     {
         me->SetImmuneToPC(false);
-        me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_NON_ATTACKABLE);
+        me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE | UNIT_FLAG_NON_ATTACKABLE);
     }
 
     void JustEngagedWith(Unit* /*who*/) override { }