Core/Misc: Remove Unit::Get* wrappers for ObjectAccessor::Get*

src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp

@@ -82,7 +82,7 @@ public:
             // check if creature is not outside of building
             if (resetTimer < diff)
             {
-                if (Creature* pBalinda = Unit::GetCreature(*me, balindaGUID))
+                if (Creature* pBalinda = ObjectAccessor::GetCreature(*me, balindaGUID))
                     if (me->GetDistance2d(pBalinda->GetHomePosition().GetPositionX(), pBalinda->GetHomePosition().GetPositionY()) > 50)
                         EnterEvadeMode();
                 resetTimer = 5 * IN_MILLISECONDS;

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp

@@ -229,7 +229,7 @@ public:
 
                     if (RingBossGUID)
                     {
-                        Creature* boss = Unit::GetCreature(*me, RingBossGUID);
+                        Creature* boss = ObjectAccessor::GetCreature(*me, RingBossGUID);
                         if (boss && !boss->IsAlive() && boss->isDead())
                         {
                             RingBossGUID = 0;
@@ -242,7 +242,7 @@ public:
 
                     for (uint8 i = 0; i < MAX_NPC_AMOUNT; ++i)
                     {
-                        Creature* mob = Unit::GetCreature(*me, RingMobGUID[i]);
+                        Creature* mob = ObjectAccessor::GetCreature(*me, RingMobGUID[i]);
                         if (mob && !mob->IsAlive() && mob->isDead())
                         {
                             RingMobGUID[i] = 0;
@@ -1304,7 +1304,7 @@ public:
                     DoGo(DATA_GO_BAR_KEG_TRAP, 0);               //doesn't work very well, leaving code here for future
                     //spell by trap has effect61, this indicate the bar go hostile
 
-                    if (Unit* tmp = Unit::GetUnit(*me, instance->GetData64(DATA_PHALANX)))
+                    if (Unit* tmp = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_PHALANX)))
                         tmp->setFaction(14);
 
                     //for later, this event(s) has alot more to it.

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp

@@ -243,37 +243,37 @@ public:
                     switch (eventId)
                     {
                         case EVENT_START_1:
-                            if (Creature* victor = me->GetCreature(*me, victorGUID))
+                            if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
                                 victor->AI()->Talk(SAY_NEFARIUS_0);
                             events.ScheduleEvent(EVENT_START_2, 4000);
                             break;
                         case EVENT_START_2:
                             events.ScheduleEvent(EVENT_TURN_TO_PLAYER, 0);
-                            if (Creature* victor = me->GetCreature(*me, victorGUID))
+                            if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
                                 victor->HandleEmoteCommand(EMOTE_ONESHOT_POINT);
                             events.ScheduleEvent(EVENT_START_3, 4000);
                             break;
                         case EVENT_START_3:
-                            if (Creature* victor = me->GetCreature(*me, victorGUID))
+                            if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
                                 victor->AI()->Talk(SAY_NEFARIUS_1);
                             events.ScheduleEvent(EVENT_WAVE_1, 2000);
                             events.ScheduleEvent(EVENT_TURN_TO_REND, 4000);
                             events.ScheduleEvent(EVENT_WAVES_TEXT_1, 20000);
                             break;
                         case EVENT_TURN_TO_REND:
-                            if (Creature* victor = me->GetCreature(*me, victorGUID))
+                            if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
                             {
                                 victor->SetFacingToObject(me);
                                 victor->HandleEmoteCommand(EMOTE_ONESHOT_TALK);
                             }
                             break;
                         case EVENT_TURN_TO_PLAYER:
-                            if (Creature* victor = me->GetCreature(*me, victorGUID))
+                            if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
                                 if (Unit* player = victor->SelectNearestPlayer(60.0f))
                                     victor->SetFacingToObject(player);
                             break;
                         case EVENT_TURN_TO_FACING_1:
-                            if (Creature* victor = me->GetCreature(*me, victorGUID))
+                            if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
                                 victor->SetFacingTo(1.518436f);
                             break;
                         case EVENT_TURN_TO_FACING_2:
@@ -283,7 +283,7 @@ public:
                             me->SetFacingTo(1.500983f);
                             break;
                         case EVENT_WAVES_EMOTE_1:
-                            if (Creature* victor = me->GetCreature(*me, victorGUID))
+                            if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
                                 victor->HandleEmoteCommand(EMOTE_ONESHOT_QUESTION);
                             break;
                         case EVENT_WAVES_EMOTE_2:
@@ -291,7 +291,7 @@ public:
                             break;
                         case EVENT_WAVES_TEXT_1:
                             events.ScheduleEvent(EVENT_TURN_TO_PLAYER, 0);
-                            if (Creature* victor = me->GetCreature(*me, victorGUID))
+                            if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
                                     victor->AI()->Talk(SAY_NEFARIUS_2);
                             me->HandleEmoteCommand(EMOTE_ONESHOT_TALK);
                             events.ScheduleEvent(EVENT_TURN_TO_FACING_1, 4000);
@@ -301,7 +301,7 @@ public:
                             break;
                         case EVENT_WAVES_TEXT_2:
                             events.ScheduleEvent(EVENT_TURN_TO_PLAYER, 0);
-                            if (Creature* victor = me->GetCreature(*me, victorGUID))
+                            if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
                                 victor->AI()->Talk(SAY_NEFARIUS_3);
                             events.ScheduleEvent(EVENT_TURN_TO_FACING_1, 4000);
                             events.ScheduleEvent(EVENT_WAVE_3, 2000);
@@ -309,7 +309,7 @@ public:
                             break;
                         case EVENT_WAVES_TEXT_3:
                             events.ScheduleEvent(EVENT_TURN_TO_PLAYER, 0);
-                            if (Creature* victor = me->GetCreature(*me, victorGUID))
+                            if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
                                 victor->AI()->Talk(SAY_NEFARIUS_4);
                             events.ScheduleEvent(EVENT_TURN_TO_FACING_1, 4000);
                             events.ScheduleEvent(EVENT_WAVE_4, 2000);
@@ -324,7 +324,7 @@ public:
                             break;
                         case EVENT_WAVES_TEXT_5:
                             events.ScheduleEvent(EVENT_TURN_TO_PLAYER, 0);
-                            if (Creature* victor = me->GetCreature(*me, victorGUID))
+                            if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
                                 victor->AI()->Talk(SAY_NEFARIUS_5);
                             events.ScheduleEvent(EVENT_TURN_TO_FACING_1, 4000);
                             events.ScheduleEvent(EVENT_WAVE_6, 2000);
@@ -332,26 +332,26 @@ public:
                             break;
                         case EVENT_WAVES_COMPLETE_TEXT_1:
                             events.ScheduleEvent(EVENT_TURN_TO_PLAYER, 0);
-                            if (Creature* victor = me->GetCreature(*me, victorGUID))
+                            if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
                                 victor->AI()->Talk(SAY_NEFARIUS_6);
                             events.ScheduleEvent(EVENT_TURN_TO_FACING_1, 4000);
                             events.ScheduleEvent(EVENT_WAVES_COMPLETE_TEXT_2, 13000);
                             break;
                         case EVENT_WAVES_COMPLETE_TEXT_2:
-                            if (Creature* victor = me->GetCreature(*me, victorGUID))
+                            if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
                                 victor->AI()->Talk(SAY_NEFARIUS_7);
                             Talk(SAY_BLACKHAND_2);
                             events.ScheduleEvent(EVENT_PATH_REND, 1000);
                             events.ScheduleEvent(EVENT_WAVES_COMPLETE_TEXT_3, 4000);
                             break;
                         case EVENT_WAVES_COMPLETE_TEXT_3:
-                            if (Creature* victor = me->GetCreature(*me, victorGUID))
+                            if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
                                 victor->AI()->Talk(SAY_NEFARIUS_8);
                             events.ScheduleEvent(EVENT_PATH_NEFARIUS, 1000);
                             events.ScheduleEvent(EVENT_PATH_REND, 1000);
                             break;
                         case EVENT_PATH_NEFARIUS:
-                            if (Creature* victor = me->GetCreature(*me, victorGUID))
+                            if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
                                 victor->GetMotionMaster()->MovePath(NEFARIUS_PATH_1, true);
                             break;
                         case EVENT_PATH_REND:

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp

@@ -167,7 +167,7 @@ public:
     {
         if (InstanceScript* instance = go->GetInstanceScript())
             if (instance->GetData(DATA_EGG_EVENT) != DONE)
-                if (Creature* razor = Unit::GetCreature(*go, instance->GetData64(DATA_RAZORGORE_THE_UNTAMED)))
+                if (Creature* razor = ObjectAccessor::GetCreature(*go, instance->GetData64(DATA_RAZORGORE_THE_UNTAMED)))
                 {
                     razor->Attack(player, true);
                     player->CastSpell(razor, SPELL_MINDCONTROL);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp

@@ -146,8 +146,8 @@ public:
                             break;
                         case EVENT_SPEECH_4:
                             me->setFaction(103);
-                            if (PlayerGUID && Unit::GetUnit(*me, PlayerGUID))
-                                AttackStart(Unit::GetUnit(*me, PlayerGUID));;
+                            if (PlayerGUID && ObjectAccessor::GetUnit(*me, PlayerGUID))
+                                AttackStart(ObjectAccessor::GetUnit(*me, PlayerGUID));;
                             break;
                     }
                 }

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp

@@ -147,7 +147,7 @@ class boss_ragnaros : public CreatureScript
                             break;
                         case EVENT_INTRO_4:
                             Talk(SAY_ARRIVAL5_RAG);
-                            if (Creature* executus = Unit::GetCreature(*me, instance->GetData64(BOSS_MAJORDOMO_EXECUTUS)))
+                            if (Creature* executus = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_MAJORDOMO_EXECUTUS)))
                                 me->Kill(executus);
                             break;
                         case EVENT_INTRO_5:

src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp

@@ -198,7 +198,7 @@ public:
             if (!SummonList.empty())
                 for (std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr)
                 {
-                    if (Creature* summon = Unit::GetCreature(*me, *itr))
+                    if (Creature* summon = ObjectAccessor::GetCreature(*me, *itr))
                     {
                         if (summon->IsAlive())
                             summon->DisappearAndDie();

src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp

@@ -101,7 +101,7 @@ public:
         void JustDied(Unit* /*killer*/) override
         {
             Talk(SAY_DEATH);
-            if (Unit* midnight = Unit::GetUnit(*me, Midnight))
+            if (Unit* midnight = ObjectAccessor::GetUnit(*me, Midnight))
                 midnight->Kill(midnight);
         }
 
@@ -149,7 +149,7 @@ public:
         {
             if (Phase == 2)
             {
-                if (Unit* unit = Unit::GetUnit(*me, Attumen))
+                if (Unit* unit = ObjectAccessor::GetUnit(*me, Attumen))
                     Talk(SAY_MIDNIGHT_KILL, unit);
             }
         }
@@ -172,7 +172,7 @@ public:
             }
             else if (Phase == 2 && HealthBelowPct(25))
             {
-                if (Unit* pAttumen = Unit::GetUnit(*me, Attumen))
+                if (Unit* pAttumen = ObjectAccessor::GetUnit(*me, Attumen))
                     Mount(pAttumen);
             }
             else if (Phase == 3)
@@ -184,7 +184,7 @@ public:
                         Mount_Timer = 0;
                         me->SetVisible(false);
                         me->GetMotionMaster()->MoveIdle();
-                        if (Unit* pAttumen = Unit::GetUnit(*me, Attumen))
+                        if (Unit* pAttumen = ObjectAccessor::GetUnit(*me, Attumen))
                         {
                             pAttumen->SetDisplayId(MOUNTED_DISPLAYID);
                             pAttumen->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -242,7 +242,7 @@ void boss_attumen::boss_attumenAI::UpdateAI(uint32 diff)
         if (ResetTimer <= diff)
         {
             ResetTimer = 0;
-            Unit* pMidnight = Unit::GetUnit(*me, Midnight);
+            Unit* pMidnight = ObjectAccessor::GetUnit(*me, Midnight);
             if (pMidnight)
             {
                 pMidnight->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -288,7 +288,7 @@ void boss_attumen::boss_attumenAI::UpdateAI(uint32 diff)
             std::vector<Unit*> target_list;
             for (ThreatContainer::StorageType::const_iterator itr = t_list.begin(); itr != t_list.end(); ++itr)
             {
-                target = Unit::GetUnit(*me, (*itr)->getUnitGuid());
+                target = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid());
                 if (target && !target->IsWithinDist(me, ATTACK_DISTANCE, false))
                     target_list.push_back(target);
                 target = NULL;
@@ -304,7 +304,7 @@ void boss_attumen::boss_attumenAI::UpdateAI(uint32 diff)
     {
         if (HealthBelowPct(25))
         {
-            Creature* pMidnight = Unit::GetCreature(*me, Midnight);
+            Creature* pMidnight = ObjectAccessor::GetCreature(*me, Midnight);
             if (pMidnight && pMidnight->GetTypeId() == TYPEID_UNIT)
             {
                 CAST_AI(boss_midnight::boss_midnightAI, (pMidnight->AI()))->Mount(me);

src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp

@@ -236,7 +236,7 @@ public:
             {
                 if (AddGUID[i])
                 {
-                    Creature* temp = Creature::GetCreature((*me), AddGUID[i]);
+                    Creature* temp = ObjectAccessor::GetCreature((*me), AddGUID[i]);
                     if (temp && temp->IsAlive())
                     {
                         temp->AI()->AttackStart(me->GetVictim());
@@ -270,7 +270,7 @@ public:
                 {
                     if (AddGUID[i])
                     {
-                        Creature* temp = Unit::GetCreature((*me), AddGUID[i]);
+                        Creature* temp = ObjectAccessor::GetCreature((*me), AddGUID[i]);
                         if (temp && temp->IsAlive())
                             if (!temp->GetVictim())
                                 temp->AI()->AttackStart(me->GetVictim());
@@ -350,7 +350,7 @@ struct boss_moroes_guestAI : public ScriptedAI
 
     void AcquireGUID()
     {
-        if (Creature* Moroes = Unit::GetCreature(*me, instance->GetData64(DATA_MOROES)))
+        if (Creature* Moroes = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MOROES)))
             for (uint8 i = 0; i < 4; ++i)
                 if (uint64 GUID = CAST_AI(boss_moroes::boss_moroesAI, Moroes->AI())->AddGUID[i])
                     GuestGUID[i] = GUID;
@@ -361,7 +361,7 @@ struct boss_moroes_guestAI : public ScriptedAI
         uint64 TempGUID = GuestGUID[rand()%4];
         if (TempGUID)
         {
-            Unit* unit = Unit::GetUnit(*me, TempGUID);
+            Unit* unit = ObjectAccessor::GetUnit(*me, TempGUID);
             if (unit && unit->IsAlive())
                 return unit;
         }

src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp

@@ -158,9 +158,9 @@ public:
         {
             for (int i=0; i<3; ++i)
             {
-                if (Creature* portal = Unit::GetCreature(*me, PortalGUID[i]))
+                if (Creature* portal = ObjectAccessor::GetCreature(*me, PortalGUID[i]))
                     portal->DisappearAndDie();
-                if (Creature* portal = Unit::GetCreature(*me, BeamerGUID[i]))
+                if (Creature* portal = ObjectAccessor::GetCreature(*me, BeamerGUID[i]))
                     portal->DisappearAndDie();
                 PortalGUID[i] = 0;
                 BeamTarget[i] = 0;
@@ -170,10 +170,10 @@ public:
         void UpdatePortals() // Here we handle the beams' behavior
         {
             for (int j=0; j<3; ++j) // j = color
-                if (Creature* portal = Unit::GetCreature(*me, PortalGUID[j]))
+                if (Creature* portal = ObjectAccessor::GetCreature(*me, PortalGUID[j]))
                 {
                     // the one who's been cast upon before
-                    Unit* current = Unit::GetUnit(*portal, BeamTarget[j]);
+                    Unit* current = ObjectAccessor::GetUnit(*portal, BeamTarget[j]);
                     // temporary store for the best suitable beam reciever
                     Unit* target = me;
 
@@ -205,7 +205,7 @@ public:
                     {
                         BeamTarget[j] = target->GetGUID();
                         // remove currently beaming portal
-                        if (Creature* beamer = Unit::GetCreature(*portal, BeamerGUID[j]))
+                        if (Creature* beamer = ObjectAccessor::GetCreature(*portal, BeamerGUID[j]))
                         {
                             beamer->CastSpell(target, PortalBeam[j], false);
                             beamer->DisappearAndDie();

src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp

@@ -146,7 +146,7 @@ public:
 
         void KilledUnit(Unit* who) override
         {
-            if (Unit* unit = Unit::GetUnit(*me, malchezaar))
+            if (Unit* unit = ObjectAccessor::GetUnit(*me, malchezaar))
                 if (Creature* creature = unit->ToCreature())
                     creature->AI()->KilledUnit(who);
         }
@@ -273,7 +273,7 @@ public:
         {
             //Infernal Cleanup
             for (std::vector<uint64>::const_iterator itr = infernals.begin(); itr != infernals.end(); ++itr)
-                if (Unit* pInfernal = Unit::GetUnit(*me, *itr))
+                if (Unit* pInfernal = ObjectAccessor::GetUnit(*me, *itr))
                     if (pInfernal->IsAlive())
                     {
                         pInfernal->SetVisible(false);
@@ -287,7 +287,7 @@ public:
         {
             for (uint8 i = 0; i < 2; ++i)
             {
-                Unit* axe = Unit::GetUnit(*me, axes[i]);
+                Unit* axe = ObjectAccessor::GetUnit(*me, axes[i]);
                 if (axe && axe->IsAlive())
                     axe->Kill(axe);
                 axes[i] = 0;
@@ -316,7 +316,7 @@ public:
             ThreatContainer::StorageType::const_iterator itr = t_list.begin();
             std::advance(itr, 1);
             for (; itr != t_list.end(); ++itr) //store the threat list in a different container
-                if (Unit* target = Unit::GetUnit(*me, (*itr)->getUnitGuid()))
+                if (Unit* target = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid()))
                     if (target->IsAlive() && target->GetTypeId() == TYPEID_PLAYER)
                         targets.push_back(target);
 
@@ -340,7 +340,7 @@ public:
         {
             for (uint8 i = 0; i < 5; ++i)
             {
-                Unit* target = Unit::GetUnit(*me, enfeeble_targets[i]);
+                Unit* target = ObjectAccessor::GetUnit(*me, enfeeble_targets[i]);
                 if (target && target->IsAlive())
                     target->SetHealth(enfeeble_health[i]);
                 enfeeble_targets[i] = 0;
@@ -480,7 +480,7 @@ public:
                     {
                         for (uint8 i = 0; i < 2; ++i)
                         {
-                            if (Unit* axe = Unit::GetUnit(*me, axes[i]))
+                            if (Unit* axe = ObjectAccessor::GetUnit(*me, axes[i]))
                             {
                                 if (axe->GetVictim())
                                     DoModifyThreatPercent(axe->GetVictim(), -100);
@@ -583,7 +583,7 @@ public:
 
 void netherspite_infernal::netherspite_infernalAI::Cleanup()
 {
-    Creature* pMalchezaar = Unit::GetCreature(*me, malchezaar);
+    Creature* pMalchezaar = ObjectAccessor::GetCreature(*me, malchezaar);
 
     if (pMalchezaar && pMalchezaar->IsAlive())
         CAST_AI(boss_malchezaar::boss_malchezaarAI, pMalchezaar->AI())->Cleanup(me, point);

src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp

@@ -184,7 +184,7 @@ public:
             //store the threat list in a different container
             for (ThreatContainer::StorageType::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
             {
-                Unit* target = Unit::GetUnit(*me, (*itr)->getUnitGuid());
+                Unit* target = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid());
                 //only on alive players
                 if (target && target->IsAlive() && target->GetTypeId() == TYPEID_PLAYER)
                     targets.push_back(target);
@@ -450,7 +450,7 @@ public:
                         if (!FlameWreathTarget[i])
                             continue;
 
-                        Unit* unit = Unit::GetUnit(*me, FlameWreathTarget[i]);
+                        Unit* unit = ObjectAccessor::GetUnit(*me, FlameWreathTarget[i]);
                         if (unit && !unit->IsWithinDist2d(FWTargPosX[i], FWTargPosY[i], 3))
                         {
                             unit->CastSpell(unit, 20476, true, 0, 0, me->GetGUID());

src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp

@@ -103,7 +103,7 @@ public:
             uint64 TerestianGUID = instance->GetData64(DATA_TERESTIAN);
             if (TerestianGUID)
             {
-                Unit* Terestian = Unit::GetUnit(*me, TerestianGUID);
+                Unit* Terestian = ObjectAccessor::GetUnit(*me, TerestianGUID);
                 if (Terestian && Terestian->IsAlive())
                     DoCast(Terestian, SPELL_BROKEN_PACT, true);
             }
@@ -158,7 +158,7 @@ public:
         {
             if (SacrificeGUID)
             {
-                Unit* Sacrifice = Unit::GetUnit(*me, SacrificeGUID);
+                Unit* Sacrifice = ObjectAccessor::GetUnit(*me, SacrificeGUID);
                 if (Sacrifice)
                     Sacrifice->RemoveAurasDueToSpell(SPELL_SACRIFICE);
             }
@@ -280,7 +280,7 @@ public:
             {
                 if (PortalGUID[i])
                 {
-                    if (Creature* pPortal = Unit::GetCreature(*me, PortalGUID[i]))
+                    if (Creature* pPortal = ObjectAccessor::GetCreature(*me, PortalGUID[i]))
                     {
                         CAST_AI(npc_fiendish_portal::npc_fiendish_portalAI, pPortal->AI())->DespawnAllImp();
                         pPortal->DespawnOrUnsummon();
@@ -345,7 +345,7 @@ public:
             {
                 if (PortalGUID[i])
                 {
-                    if (Creature* pPortal = Unit::GetCreature((*me), PortalGUID[i]))
+                    if (Creature* pPortal = ObjectAccessor::GetCreature((*me), PortalGUID[i]))
                         pPortal->DespawnOrUnsummon();
 
                     PortalGUID[i] = 0;
@@ -396,7 +396,7 @@ public:
 
                 if (PortalGUID[0] && PortalGUID[1])
                 {
-                    if (Creature* pPortal = Unit::GetCreature(*me, PortalGUID[urand(0, 1)]))
+                    if (Creature* pPortal = ObjectAccessor::GetCreature(*me, PortalGUID[urand(0, 1)]))
                         pPortal->CastSpell(me->GetVictim(), SPELL_SUMMON_FIENDISIMP, false);
                     SummonTimer = 5000;
                 }

src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp

@@ -254,7 +254,7 @@ public:
         {
             if (DorotheeGUID)
             {
-                Creature* Dorothee = (Unit::GetCreature((*me), DorotheeGUID));
+                Creature* Dorothee = (ObjectAccessor::GetCreature((*me), DorotheeGUID));
                 if (Dorothee && Dorothee->IsAlive())
                 {
                     CAST_AI(boss_dorothee::boss_dorotheeAI, Dorothee->AI())->TitoDied = true;
@@ -893,7 +893,7 @@ public:
                 {
                     IsChasing = false;
 
-                    if (Unit* target = Unit::GetUnit(*me, HoodGUID))
+                    if (Unit* target = ObjectAccessor::GetUnit(*me, HoodGUID))
                     {
                         HoodGUID = 0;
                         if (DoGetThreat(target))
@@ -1186,7 +1186,7 @@ public:
                 IsFakingDeath = true;
                 Phase = PHASE_BOTH;
 
-                if (Creature* Julianne = (Unit::GetCreature((*me), JulianneGUID)))
+                if (Creature* Julianne = (ObjectAccessor::GetCreature((*me), JulianneGUID)))
                 {
                     CAST_AI(boss_julianne::boss_julianneAI, Julianne->AI())->RomuloDead = true;
                     CAST_AI(boss_julianne::boss_julianneAI, Julianne->AI())->ResurrectSelfTimer = 10000;
@@ -1200,7 +1200,7 @@ public:
             {
                 if (JulianneDead)
                 {
-                    if (Creature* Julianne = (Unit::GetCreature((*me), JulianneGUID)))
+                    if (Creature* Julianne = (ObjectAccessor::GetCreature((*me), JulianneGUID)))
                     {
                         Julianne->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                         Julianne->GetMotionMaster()->Clear();
@@ -1212,7 +1212,7 @@ public:
                     return;
                 }
 
-                if (Creature* Julianne = (Unit::GetCreature((*me), JulianneGUID)))
+                if (Creature* Julianne = (ObjectAccessor::GetCreature((*me), JulianneGUID)))
                 {
                     PretendToDie(me);
                     IsFakingDeath = true;
@@ -1231,7 +1231,7 @@ public:
             Talk(SAY_ROMULO_AGGRO);
             if (JulianneGUID)
             {
-                Creature* Julianne = (Unit::GetCreature((*me), JulianneGUID));
+                Creature* Julianne = (ObjectAccessor::GetCreature((*me), JulianneGUID));
                 if (Julianne && Julianne->GetVictim())
                 {
                     me->AddThreat(Julianne->GetVictim(), 1.0f);
@@ -1275,7 +1275,7 @@ public:
             {
                 if (ResurrectTimer <= diff)
                 {
-                    Creature* Julianne = (Unit::GetCreature((*me), JulianneGUID));
+                    Creature* Julianne = (ObjectAccessor::GetCreature((*me), JulianneGUID));
                     if (Julianne && CAST_AI(boss_julianne::boss_julianneAI, Julianne->AI())->IsFakingDeath)
                     {
                         Talk(SAY_ROMULO_RESURRECT);
@@ -1395,7 +1395,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff)
     {
         if (ResurrectTimer <= diff)
         {
-            Creature* Romulo = (Unit::GetCreature((*me), RomuloGUID));
+            Creature* Romulo = (ObjectAccessor::GetCreature((*me), RomuloGUID));
             if (Romulo && CAST_AI(boss_romulo::boss_romuloAI, Romulo->AI())->IsFakingDeath)
             {
                 Talk(SAY_JULIANNE_RESURRECT);
@@ -1430,7 +1430,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff)
     {
         if (urand(0, 1) && SummonedRomulo)
         {
-            Creature* Romulo = (Unit::GetCreature((*me), RomuloGUID));
+            Creature* Romulo = (ObjectAccessor::GetCreature((*me), RomuloGUID));
             if (Romulo && Romulo->IsAlive() && !RomuloDead)
                 DoCast(Romulo, SPELL_ETERNAL_AFFECTION);
         } else DoCast(me, SPELL_ETERNAL_AFFECTION);
@@ -1460,7 +1460,7 @@ void boss_julianne::boss_julianneAI::DamageTaken(Unit* /*done_by*/, uint32 &dama
         DoCast(me, SPELL_DRINK_POISON);
 
         IsFakingDeath = true;
-        //IS THIS USEFULL? Creature* Julianne = (Unit::GetCreature((*me), JulianneGUID));
+        //IS THIS USEFULL? Creature* Julianne = (ObjectAccessor::GetCreature((*me), JulianneGUID));
         return;
     }
 
@@ -1476,7 +1476,7 @@ void boss_julianne::boss_julianneAI::DamageTaken(Unit* /*done_by*/, uint32 &dama
         //if this is true then we have to kill romulo too
         if (RomuloDead)
         {
-            if (Creature* Romulo = (Unit::GetCreature((*me), RomuloGUID)))
+            if (Creature* Romulo = (ObjectAccessor::GetCreature((*me), RomuloGUID)))
             {
                 Romulo->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 Romulo->GetMotionMaster()->Clear();
@@ -1490,7 +1490,7 @@ void boss_julianne::boss_julianneAI::DamageTaken(Unit* /*done_by*/, uint32 &dama
         }
 
         //if not already returned, then romulo is alive and we can pretend die
-        if (Creature* Romulo = (Unit::GetCreature((*me), RomuloGUID)))
+        if (Creature* Romulo = (ObjectAccessor::GetCreature((*me), RomuloGUID)))
         {
             PretendToDie(me);
             IsFakingDeath = true;

src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp

@@ -286,7 +286,7 @@ public:
                 {
                     if (TalkCount > 3)
                     {
-                        if (Creature* pSpotlight = Unit::GetCreature(*me, m_uiSpotlightGUID))
+                        if (Creature* pSpotlight = ObjectAccessor::GetCreature(*me, m_uiSpotlightGUID))
                             pSpotlight->DespawnOrUnsummon();
 
                         SetEscortPaused(false);
@@ -539,7 +539,7 @@ public:
 
         uint32 NextStep(uint32 Step)
         {
-            Creature* arca = Unit::GetCreature(*me, ArcanagosGUID);
+            Creature* arca = ObjectAccessor::GetCreature(*me, ArcanagosGUID);
             Map* map = me->GetMap();
             switch (Step)
             {
@@ -630,7 +630,7 @@ public:
 
             if (Step >= 7 && Step <= 12)
             {
-                Unit* arca = Unit::GetUnit(*me, ArcanagosGUID);
+                Unit* arca = ObjectAccessor::GetUnit(*me, ArcanagosGUID);
 
                 if (FireArcanagosTimer <= diff)
                 {

src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp

@@ -196,7 +196,7 @@ public:
             ThreatContainer::StorageType::const_iterator i = threatlist.begin();
             for (i = threatlist.begin(); i != threatlist.end(); ++i)
             {
-                Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid());
+                Unit* unit = ObjectAccessor::GetUnit(*me, (*i)->getUnitGuid());
                 if (unit && unit->IsAlive())
                 {
                     float threat = me->getThreatManager().getThreat(unit);
@@ -214,7 +214,7 @@ public:
             ThreatContainer::StorageType::const_iterator i = threatlist.begin();
             for (i = threatlist.begin(); i != threatlist.end(); ++i)
             {
-                Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid());
+                Unit* unit = ObjectAccessor::GetUnit(*me, (*i)->getUnitGuid());
                 if (unit && (unit->GetTypeId() == TYPEID_PLAYER))
                     unit->CastSpell(unit, SPELL_TELEPORT_CENTER, true);
             }
@@ -227,7 +227,7 @@ public:
             ThreatContainer::StorageType::const_iterator i = threatlist.begin();
             for (i = threatlist.begin(); i != threatlist.end(); ++i)
             {
-                Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid());
+                Unit* unit = ObjectAccessor::GetUnit(*me, (*i)->getUnitGuid());
                 if (unit && (unit->GetTypeId() == TYPEID_PLAYER))
                     // Knockback into the air
                     unit->CastSpell(unit, SPELL_GRAVITY_LAPSE_DOT, true, 0, 0, me->GetGUID());
@@ -240,7 +240,7 @@ public:
             ThreatContainer::StorageType::const_iterator i = threatlist.begin();
             for (i = threatlist.begin(); i != threatlist.end(); ++i)
             {
-                Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid());
+                Unit* unit = ObjectAccessor::GetUnit(*me, (*i)->getUnitGuid());
                 if (unit && (unit->GetTypeId() == TYPEID_PLAYER))
                 {
                     // Also needs an exception in spell system.
@@ -260,7 +260,7 @@ public:
             ThreatContainer::StorageType::const_iterator i = threatlist.begin();
             for (i = threatlist.begin(); i != threatlist.end(); ++i)
             {
-                Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid());
+                Unit* unit = ObjectAccessor::GetUnit(*me, (*i)->getUnitGuid());
                 if (unit && (unit->GetTypeId() == TYPEID_PLAYER))
                 {
                     unit->RemoveAurasDueToSpell(SPELL_GRAVITY_LAPSE_FLY);

src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp

@@ -162,7 +162,7 @@ public:
 
             for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
             {
-                if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[i]))
+                if (Unit* pAdd = ObjectAccessor::GetUnit(*me, m_auiLackeyGUID[i]))
                 {
                     if (!pAdd->GetVictim())
                     {
@@ -210,7 +210,7 @@ public:
             {
                 for (std::vector<uint32>::const_iterator itr = LackeyEntryList.begin(); itr != LackeyEntryList.end(); ++itr)
                 {
-                    Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[j]);
+                    Unit* pAdd = ObjectAccessor::GetUnit(*me, m_auiLackeyGUID[j]);
 
                     //object already removed, not exist
                     if (!pAdd)
@@ -271,7 +271,7 @@ public:
                 Unit* target = me;
                 for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
                 {
-                    if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[i]))
+                    if (Unit* pAdd = ObjectAccessor::GetUnit(*me, m_auiLackeyGUID[i]))
                     {
                         if (pAdd->IsAlive() && pAdd->GetHealth() < health)
                             target = pAdd;
@@ -287,7 +287,7 @@ public:
                 Unit* target = me;
 
                 if (urand(0, 1))
-                    if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY]))
+                    if (Unit* pAdd = ObjectAccessor::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY]))
                         if (pAdd->IsAlive())
                             target = pAdd;
 
@@ -300,7 +300,7 @@ public:
                 Unit* target = me;
 
                 if (urand(0, 1))
-                    if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY]))
+                    if (Unit* pAdd = ObjectAccessor::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY]))
                         if (pAdd->IsAlive() && !pAdd->HasAura(SPELL_SHIELD))
                             target = pAdd;
 
@@ -319,7 +319,7 @@ public:
                     if (urand(0, 1))
                         target = me;
                     else
-                        if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY]))
+                        if (Unit* pAdd = ObjectAccessor::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY]))
                             if (pAdd->IsAlive())
                                 target = pAdd;
                 }
@@ -390,7 +390,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
 
         for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
         {
-            if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUIDs[i]))
+            if (Unit* pAdd = ObjectAccessor::GetUnit(*me, m_auiLackeyGUIDs[i]))
             {
                 if (!pAdd->GetVictim() && pAdd != me)
                 {
@@ -400,7 +400,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
             }
         }
 
-        if (Creature* pDelrissa = Unit::GetCreature(*me, instance->GetData64(DATA_DELRISSA)))
+        if (Creature* pDelrissa = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_DELRISSA)))
         {
             if (pDelrissa->IsAlive() && !pDelrissa->GetVictim())
             {
@@ -412,7 +412,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
 
     void JustDied(Unit* /*killer*/) override
     {
-        Creature* pDelrissa = Unit::GetCreature(*me, instance->GetData64(DATA_DELRISSA));
+        Creature* pDelrissa = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_DELRISSA));
         uint32 uiLackeyDeathCount = instance->GetData(DATA_DELRISSA_DEATH_COUNT);
 
         if (!pDelrissa)
@@ -441,13 +441,13 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
 
     void KilledUnit(Unit* victim) override
     {
-        if (Creature* Delrissa = Unit::GetCreature(*me, instance->GetData64(DATA_DELRISSA)))
+        if (Creature* Delrissa = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_DELRISSA)))
             Delrissa->AI()->KilledUnit(victim);
     }
 
     void AcquireGUIDs()
     {
-        if (Creature* Delrissa = (Unit::GetCreature(*me, instance->GetData64(DATA_DELRISSA))))
+        if (Creature* Delrissa = (ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_DELRISSA))))
         {
             for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
                 m_auiLackeyGUIDs[i] = CAST_AI(boss_priestess_delrissa::boss_priestess_delrissaAI, Delrissa->AI())->m_auiLackeyGUID[i];
@@ -832,7 +832,7 @@ public:
                 ThreatContainer::StorageType const &t_list = me->getThreatManager().getThreatList();
                 for (ThreatContainer::StorageType::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
                 {
-                    if (Unit* target = Unit::GetUnit(*me, (*itr)->getUnitGuid()))
+                    if (Unit* target = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid()))
                     {
                         //if in melee range
                         if (target->IsWithinDistInMap(me, 5))
@@ -918,7 +918,7 @@ public:
                 ThreatContainer::StorageType const &t_list = me->getThreatManager().getThreatList();
                 for (ThreatContainer::StorageType::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
                 {
-                    if (Unit* target = Unit::GetUnit(*me, (*itr)->getUnitGuid()))
+                    if (Unit* target = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid()))
                     {
                         //if in melee range
                         if (target->IsWithinDistInMap(me, ATTACK_DISTANCE))
@@ -1022,7 +1022,7 @@ public:
             Wing_Clip_Timer = 4000;
             Freezing_Trap_Timer = 15000;
 
-            Unit* pPet = Unit::GetUnit(*me, m_uiPetGUID);
+            Unit* pPet = ObjectAccessor::GetUnit(*me, m_uiPetGUID);
             if (!pPet)
                 me->SummonCreature(NPC_SLIVER, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
 
@@ -1171,7 +1171,7 @@ public:
                 // uint64 guid = (*itr)->guid;
                 // if (guid)
                 // {
-                //   Unit* pAdd = Unit::GetUnit(*me, (*itr)->guid);
+                //   Unit* pAdd = ObjectAccessor::GetUnit(*me, (*itr)->guid);
                 //   if (pAdd && pAdd->IsAlive())
                 //   {
                 DoCast(me, SPELL_LESSER_HEALING_WAVE);
@@ -1256,7 +1256,7 @@ public:
             {
                 for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
                 {
-                    if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUIDs[i]))
+                    if (Unit* pAdd = ObjectAccessor::GetUnit(*me, m_auiLackeyGUIDs[i]))
                     {
                         if (pAdd->IsPolymorphed())
                         {

src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp

@@ -107,8 +107,8 @@ public:
             //for (uint8 i = 0; i < CRYSTALS_NUMBER; ++i)
             for (std::list<uint64>::const_iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr)
             {
-                //Unit* unit = Unit::GetUnit(*me, FelCrystals[i]);
-                if (Creature* creature = Unit::GetCreature(*me, *itr))
+                //Unit* unit = ObjectAccessor::GetUnit(*me, FelCrystals[i]);
+                if (Creature* creature = ObjectAccessor::GetCreature(*me, *itr))
                 {
                     if (!creature->IsAlive())
                         creature->Respawn();      // Let the core handle setting death state, etc.
@@ -148,8 +148,8 @@ public:
             for (std::list<uint64>::const_iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr)
             {
                 pCrystal = NULL;
-                //pCrystal = Unit::GetUnit(*me, FelCrystals[i]);
-                pCrystal = Unit::GetUnit(*me, *itr);
+                //pCrystal = ObjectAccessor::GetUnit(*me, FelCrystals[i]);
+                pCrystal = ObjectAccessor::GetUnit(*me, *itr);
                 if (pCrystal && pCrystal->IsAlive())
                 {
                     // select nearest
@@ -184,8 +184,8 @@ public:
             //for (uint8 i = 0; i < CRYSTALS_NUMBER; ++i)
             for (std::list<uint64>::const_iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr)
             {
-                //Creature* pCrystal = (Unit::GetCreature(*me, FelCrystals[i]));
-                Creature* pCrystal = Unit::GetCreature(*me, *itr);
+                //Creature* pCrystal = (ObjectAccessor::GetCreature(*me, FelCrystals[i]));
+                Creature* pCrystal = ObjectAccessor::GetCreature(*me, *itr);
                 if (pCrystal && pCrystal->IsAlive())
                     pCrystal->Kill(pCrystal);
             }
@@ -206,7 +206,7 @@ public:
         {
             if (type == POINT_MOTION_TYPE && id == 1)
             {
-                Unit* CrystalChosen = Unit::GetUnit(*me, CrystalGUID);
+                Unit* CrystalChosen = ObjectAccessor::GetUnit(*me, CrystalGUID);
                 if (CrystalChosen && CrystalChosen->IsAlive())
                 {
                     // Make the crystal attackable
@@ -292,7 +292,7 @@ public:
 
                         Talk(SAY_EMPOWERED);
 
-                        Unit* CrystalChosen = Unit::GetUnit(*me, CrystalGUID);
+                        Unit* CrystalChosen = ObjectAccessor::GetUnit(*me, CrystalGUID);
                         if (CrystalChosen && CrystalChosen->IsAlive())
                             // Use Deal Damage to kill it, not setDeathState.
                             CrystalChosen->Kill(CrystalChosen);
@@ -335,7 +335,7 @@ public:
         {
             if (InstanceScript* instance = me->GetInstanceScript())
             {
-                Creature* Selin = (Unit::GetCreature(*me, instance->GetData64(DATA_SELIN)));
+                Creature* Selin = (ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_SELIN)));
                 if (Selin && Selin->IsAlive())
                 {
                     if (CAST_AI(boss_selin_fireheart::boss_selin_fireheartAI, Selin->AI())->CrystalGUID == me->GetGUID())

src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp

@@ -314,7 +314,7 @@ public:
     {
         if (Creature* anchor = go->FindNearestCreature(29521, 15))
             if (uint64 prisonerGUID = anchor->AI()->GetGUID())
-                if (Creature* prisoner = Creature::GetCreature(*player, prisonerGUID))
+                if (Creature* prisoner = ObjectAccessor::GetCreature(*player, prisonerGUID))
                     CAST_AI(npc_unworthy_initiate::npc_unworthy_initiateAI, prisoner->AI())->EventStart(anchor, player);
 
         return false;
@@ -467,7 +467,7 @@ public:
                     {
                         me->setFaction(FACTION_HOSTILE);
 
-                        if (Unit* unit = Unit::GetUnit(*me, m_uiDuelerGUID))
+                        if (Unit* unit = ObjectAccessor::GetUnit(*me, m_uiDuelerGUID))
                             AttackStart(unit);
                     }
                     else
@@ -1047,14 +1047,14 @@ class npc_scarlet_miner : public CreatureScript
                     {
                         if (IntroPhase == 1)
                         {
-                            if (Creature* car = Unit::GetCreature(*me, carGUID))
+                            if (Creature* car = ObjectAccessor::GetCreature(*me, carGUID))
                                 DoCast(car, SPELL_CART_DRAG);
                             IntroTimer = 800;
                             IntroPhase = 2;
                         }
                         else
                         {
-                            if (Creature* car = Unit::GetCreature(*me, carGUID))
+                            if (Creature* car = ObjectAccessor::GetCreature(*me, carGUID))
                                 car->AI()->DoAction(0);
                             IntroPhase = 0;
                         }

src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp

@@ -307,7 +307,7 @@ public:
                             break;
                         case 4:
                         {
-                            Creature* temp = Unit::GetCreature(*me, valrothGUID);
+                            Creature* temp = ObjectAccessor::GetCreature(*me, valrothGUID);
 
                             if (!temp || !temp->IsAlive())
                             {

src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp

@@ -400,15 +400,15 @@ public:
                 //UpdateWorldState(me->GetMap(), WORLD_STATE_COUNTDOWN, 0);
                 UpdateWorldState(me->GetMap(), WORLD_STATE_EVENT_BEGIN, 0);
 
-                if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID))
+                if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID))
                     temp->setDeathState(JUST_DIED);
-                if (Creature* temp = Unit::GetCreature(*me, uiKorfaxGUID))
+                if (Creature* temp = ObjectAccessor::GetCreature(*me, uiKorfaxGUID))
                     temp->setDeathState(JUST_DIED);
-                if (Creature* temp = Unit::GetCreature(*me, uiMaxwellGUID))
+                if (Creature* temp = ObjectAccessor::GetCreature(*me, uiMaxwellGUID))
                     temp->setDeathState(JUST_DIED);
-                if (Creature* temp = Unit::GetCreature(*me, uiEligorGUID))
+                if (Creature* temp = ObjectAccessor::GetCreature(*me, uiEligorGUID))
                     temp->setDeathState(JUST_DIED);
-                if (Creature* temp = Unit::GetCreature(*me, uiRayneGUID))
+                if (Creature* temp = ObjectAccessor::GetCreature(*me, uiRayneGUID))
                     temp->setDeathState(JUST_DIED);
 
                 uiTirionGUID = 0;
@@ -419,24 +419,24 @@ public:
 
                 for (uint8 i = 0; i < ENCOUNTER_DEFENDER_NUMBER; ++i)
                 {
-                    if (Creature* temp = Unit::GetCreature(*me, uiDefenderGUID[i]))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiDefenderGUID[i]))
                         temp->setDeathState(JUST_DIED);
                     uiDefenderGUID[i] = 0;
                 }
                 for (uint8 i = 0; i < ENCOUNTER_EARTHSHATTER_NUMBER; ++i)
                 {
-                    if (Creature* temp = Unit::GetCreature(*me, uiEarthshatterGUID[i]))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiEarthshatterGUID[i]))
                         temp->setDeathState(JUST_DIED);
                     uiEarthshatterGUID[i] = 0;
                 }
 
-                if (Creature* temp = Unit::GetCreature(*me, uiKoltiraGUID))
+                if (Creature* temp = ObjectAccessor::GetCreature(*me, uiKoltiraGUID))
                     temp->Respawn();
-                if (Creature* temp = Unit::GetCreature(*me, uiOrbazGUID))
+                if (Creature* temp = ObjectAccessor::GetCreature(*me, uiOrbazGUID))
                     temp->Respawn();
-                if (Creature* temp = Unit::GetCreature(*me, uiThassarianGUID))
+                if (Creature* temp = ObjectAccessor::GetCreature(*me, uiThassarianGUID))
                     temp->Respawn();
-                if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID))
+                if (Creature* temp = ObjectAccessor::GetCreature(*me, uiLichKingGUID))
                     temp->Respawn();
 
                 uiKoltiraGUID = 0;
@@ -445,25 +445,25 @@ public:
                 uiLichKingGUID = 0;
                 for (uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
                 {
-                    if (Creature* temp = Unit::GetCreature(*me, uiAbominationGUID[i]))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiAbominationGUID[i]))
                         temp->setDeathState(JUST_DIED);
                     uiAbominationGUID[i] = 0;
                 }
                 for (uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
                 {
-                    if (Creature* temp = Unit::GetCreature(*me, uiBehemothGUID[i]))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiBehemothGUID[i]))
                         temp->setDeathState(JUST_DIED);
                     uiBehemothGUID[i] = 0;
                 }
                 for (uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
                 {
-                    if (Creature* temp = Unit::GetCreature(*me, uiGhoulGUID[i]))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiGhoulGUID[i]))
                         temp->setDeathState(JUST_DIED);
                     uiGhoulGUID[i] = 0;
                 }
                 for (uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
                 {
-                    if (Creature* temp = Unit::GetCreature(*me, uiWarriorGUID[i]))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiWarriorGUID[i]))
                         temp->setDeathState(JUST_DIED);
                     uiWarriorGUID[i] = 0;
                 }
@@ -514,9 +514,9 @@ public:
                 case 1:
                     SetHoldState(true);
                     SpawnNPC();
-                    if (Creature* temp = Unit::GetCreature(*me, uiKorfaxGUID))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiKorfaxGUID))
                         temp->AI()->Talk(SAY_LIGHT_OF_DAWN07);
-                    if (Creature* temp = Unit::GetCreature(*me, uiMaxwellGUID))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiMaxwellGUID))
                         temp->AI()->Talk(SAY_LIGHT_OF_DAWN08);
 
                     for (uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
@@ -534,9 +534,9 @@ public:
                     me->Dismount();
                     me->CastSpell(me, SPELL_THE_MIGHT_OF_MOGRAINE, true); // need to fix, on player only
 
-                    if (Creature* temp = Unit::GetCreature(*me, uiKoltiraGUID))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiKoltiraGUID))
                         temp->Dismount();
-                    if (Creature* temp = Unit::GetCreature(*me, uiThassarianGUID))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiThassarianGUID))
                         temp->Dismount();
 
                     bIsBattle = true;
@@ -547,37 +547,37 @@ public:
                     break;
                 case 3:
                 {
-                    //Unit* pTirion = Unit::GetCreature(*me, uiTirionGUID);
+                    //Unit* pTirion = ObjectAccessor::GetCreature(*me, uiTirionGUID);
 
                     Talk(EMOTE_LIGHT_OF_DAWN05);
                     if (me->HasAura(SPELL_THE_LIGHT_OF_DAWN, 0))
                         me->RemoveAurasDueToSpell(SPELL_THE_LIGHT_OF_DAWN);
-                    if (Creature* temp = Unit::GetCreature(*me, uiKoltiraGUID))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiKoltiraGUID))
                     {
                         if (temp->HasAura(SPELL_THE_LIGHT_OF_DAWN, 0))
                             temp->RemoveAurasDueToSpell(SPELL_THE_LIGHT_OF_DAWN);
                         temp->SetWalk(true);
                         temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[19].x, LightofDawnLoc[19].y, LightofDawnLoc[19].z);
                     }
-                    if (Creature* temp = Unit::GetCreature(*me, uiThassarianGUID))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiThassarianGUID))
                     {
                         if (temp->HasAura(SPELL_THE_LIGHT_OF_DAWN, 0))
                             temp->RemoveAurasDueToSpell(SPELL_THE_LIGHT_OF_DAWN);
                         temp->SetWalk(true);
                         temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[21].x, LightofDawnLoc[21].y, LightofDawnLoc[21].z);
                     }
-                    if (Creature* temp = Unit::GetCreature(*me, uiKorfaxGUID))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiKorfaxGUID))
                     {
                         temp->SetWalk(true);
                         temp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_READY2H);
                         temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[10].x, LightofDawnLoc[10].y, LightofDawnLoc[10].z);
                     }
-                    if (Creature* temp = Unit::GetCreature(*me, uiMaxwellGUID))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiMaxwellGUID))
                     {
                         temp->SetWalk(true);
                         temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[13].x, LightofDawnLoc[13].y, LightofDawnLoc[13].z);
                     }
-                    if (Creature* temp = Unit::GetCreature(*me, uiEligorGUID))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiEligorGUID))
                     {
                         temp->SetWalk(true);
                         temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[16].x, LightofDawnLoc[16].y, LightofDawnLoc[16].z);
@@ -589,9 +589,9 @@ public:
                     Talk(SAY_LIGHT_OF_DAWN27);
                     me->SetStandState(UNIT_STAND_STATE_KNEEL);
 
-                    if (Creature* temp = Unit::GetCreature(*me, uiKoltiraGUID))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiKoltiraGUID))
                         temp->SetStandState(UNIT_STAND_STATE_KNEEL);
-                    if (Creature* temp = Unit::GetCreature(*me, uiThassarianGUID))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiThassarianGUID))
                         temp->SetStandState(UNIT_STAND_STATE_KNEEL);
                     SetHoldState(true);
                     break;
@@ -610,7 +610,7 @@ public:
                     break;
                 case 8:
                     me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 0, uint32(EQUIP_UNEQUIP));
-                    if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID))
                         me->CastSpell(temp, SPELL_ASHBRINGER, true);
                     Talk(EMOTE_LIGHT_OF_DAWN14);
                     SetHoldState(true);
@@ -743,51 +743,51 @@ public:
 
                         case 9: // charge begins
                             SetHoldState(false);
-                            if (Creature* temp = Unit::GetCreature(*me, uiKoltiraGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiKoltiraGUID))
                             {
                                 temp->SetWalk(false);
                                 temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z);
                             }
-                            if (Creature* temp = Unit::GetCreature(*me, uiOrbazGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiOrbazGUID))
                             {
                                 temp->SetWalk(false);
                                 temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z);
                             }
-                            if (Creature* temp = Unit::GetCreature(*me, uiThassarianGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiThassarianGUID))
                             {
                                 temp->SetWalk(false);
                                 temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z);
                             }
                             for (uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
-                                if (Creature* temp = Unit::GetCreature(*me, uiAbominationGUID[i]))
+                                if (Creature* temp = ObjectAccessor::GetCreature(*me, uiAbominationGUID[i]))
                                     temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z);
                             for (uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
-                                if (Creature* temp = Unit::GetCreature(*me, uiBehemothGUID[i]))
+                                if (Creature* temp = ObjectAccessor::GetCreature(*me, uiBehemothGUID[i]))
                                     temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z);
                             for (uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
-                                if (Creature* temp = Unit::GetCreature(*me, uiGhoulGUID[i]))
+                                if (Creature* temp = ObjectAccessor::GetCreature(*me, uiGhoulGUID[i]))
                                     temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z);
                             for (uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
-                                if (Creature* temp = Unit::GetCreature(*me, uiWarriorGUID[i]))
+                                if (Creature* temp = ObjectAccessor::GetCreature(*me, uiWarriorGUID[i]))
                                     temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z);
                             JumpToNextStep(5000);
                             break;
 
                         // ******* After battle *****************************************************************
                         case 11: // Tirion starts to speak
-                            if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN28);
                             JumpToNextStep(21000);
                             break;
 
                         case 12:
-                            if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN29);
                             JumpToNextStep(13000);
                             break;
 
                         case 13:
-                            if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN30);
                             JumpToNextStep(13000);
                             break;
@@ -810,7 +810,7 @@ public:
                             break;
 
                         case 16: // Alexandros out
-                            if (Creature* temp = Unit::GetCreature(*me, uiAlexandrosGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiAlexandrosGUID))
                             {
                                 temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                                 temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[23].x, LightofDawnLoc[23].y, LightofDawnLoc[23].z);
@@ -837,7 +837,7 @@ public:
                             break;
 
                         case 19: // runs to father
-                            if (Creature* temp = Unit::GetCreature(*me, uiDarionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiDarionGUID))
                             {
                                 temp->AI()->Talk(EMOTE_LIGHT_OF_DAWN07);
                                 temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[25].x, LightofDawnLoc[25].y, LightofDawnLoc[25].z);
@@ -846,59 +846,59 @@ public:
                             break;
 
                         case 20:
-                            if (Creature* temp = Unit::GetCreature(*me, uiDarionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiDarionGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN36);
                             JumpToNextStep(4000);
                             break;
 
                         case 21:
-                            if (Creature* temp = Unit::GetCreature(*me, uiDarionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiDarionGUID))
                                 temp->AI()->Talk(EMOTE_LIGHT_OF_DAWN08);
                             JumpToNextStep(4000);
                             break;
 
                         case 22:
-                            if (Creature* temp = Unit::GetCreature(*me, uiAlexandrosGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiAlexandrosGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN37);
                             JumpToNextStep(8000);
                             break;
 
                         case 23:
-                            if (Creature* temp = Unit::GetCreature(*me, uiDarionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiDarionGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN38);
                             JumpToNextStep(8000);
                             break;
 
                         case 24:
-                            if (Creature* temp = Unit::GetCreature(*me, uiAlexandrosGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiAlexandrosGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN39);
 
-                            if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) // Tirion moves forward here
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID)) // Tirion moves forward here
                                 temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[1].x, LightofDawnLoc[1].y, LightofDawnLoc[1].z);
 
                             JumpToNextStep(15000);
                             break;
 
                         case 25:
-                            if (Creature* temp = Unit::GetCreature(*me, uiDarionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiDarionGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN40);
                             JumpToNextStep(11000);
                             break;
 
                         case 26:
-                            if (Creature* temp = Unit::GetCreature(*me, uiAlexandrosGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiAlexandrosGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN41);
                             JumpToNextStep(5000);
                             break;
 
                         case 27:
-                            if (Creature* temp = Unit::GetCreature(*me, uiDarionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiDarionGUID))
                                 temp->setDeathState(JUST_DIED);
                             JumpToNextStep(24000);
                             break;
 
                         case 28:
-                            if (Creature* temp = Unit::GetCreature(*me, uiAlexandrosGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiAlexandrosGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN42);
                             JumpToNextStep(6000);
                             break;
@@ -908,19 +908,19 @@ public:
                             {
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN43);
                                 uiLichKingGUID = temp->GetGUID();
-                                if (Unit* pAlex = Unit::GetCreature(*me, uiAlexandrosGUID))
+                                if (Unit* pAlex = ObjectAccessor::GetCreature(*me, uiAlexandrosGUID))
                                     temp->CastSpell(pAlex, SPELL_SOUL_FEAST_ALEX, false);
                             }
                             JumpToNextStep(2000);
                             break;
 
                         case 30:
-                            if (Creature* temp = Unit::GetCreature(*me, uiAlexandrosGUID)) // just hide him
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiAlexandrosGUID)) // just hide him
                             {
                                 temp->AI()->Talk(EMOTE_LIGHT_OF_DAWN09);
                                 temp->SetVisible(false);
                             }
-                            if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiLichKingGUID))
                             {
                                 temp->InterruptNonMeleeSpells(false);
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN45);
@@ -936,13 +936,13 @@ public:
                             break;
 
                         case 32:
-                            if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiLichKingGUID))
                                 temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[27].x, LightofDawnLoc[27].y, LightofDawnLoc[27].z);
                             JumpToNextStep(6000);
                             break;
 
                         case 33: // Darion supports to jump to lich king here
-                            if (Unit::GetCreature(*me, uiLichKingGUID))
+                            if (ObjectAccessor::GetCreature(*me, uiLichKingGUID))
                                 DoCast(me, SPELL_MOGRAINE_CHARGE); // jumping charge
                             // doesn't make it looks well, so workarounds, Darion charges, looks better
                             me->SetSpeed(MOVE_RUN, 3.0f);
@@ -952,7 +952,7 @@ public:
                             break;
 
                         case 35: // Lich king counterattacks
-                            if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiLichKingGUID))
                             {
                                 temp->HandleEmoteCommand(EMOTE_ONESHOT_KICK);
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN46);
@@ -969,29 +969,29 @@ public:
                             break;
 
                         case 38:
-                            if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN47);
                             JumpToNextStep(8000);
                             break;
 
                         case 39:
-                            if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiLichKingGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN48);
                             JumpToNextStep(15000);
                             break;
 
                         case 40:
-                            if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiLichKingGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN49);
                             JumpToNextStep(17000);
                             break;
 
                         case 41: // Lich king - Apocalypse
-                            if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiLichKingGUID))
                             {
                                 temp->AI()->Talk(EMOTE_LIGHT_OF_DAWN11);
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN51);
-                                if (Creature* pTirion = Unit::GetCreature(*me, uiTirionGUID))
+                                if (Creature* pTirion = ObjectAccessor::GetCreature(*me, uiTirionGUID))
                                 {
                                     pTirion->SetStandState(UNIT_STAND_STATE_KNEEL);
                                     //temp->CastSpell(pTirion, SPELL_APOCALYPSE, false); // not working
@@ -1007,7 +1007,7 @@ public:
                                 float fLichPositionX = 0,
                                       fLichPositionY = 0,
                                       fLichPositionZ = 0;
-                                if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID))
+                                if (Creature* temp = ObjectAccessor::GetCreature(*me, uiLichKingGUID))
                                 {
                                     fLichPositionX = temp->GetPositionX();
                                     fLichPositionY = temp->GetPositionY();
@@ -1032,7 +1032,7 @@ public:
                                     temp->GetMotionMaster()->MovePoint(0, fLichPositionX, fLichPositionY, fLichPositionZ);
                                     uiEarthshatterGUID[0] = temp->GetGUID();
                                 }
-                                if (Creature* temp = Unit::GetCreature(*me, uiMaxwellGUID))
+                                if (Creature* temp = ObjectAccessor::GetCreature(*me, uiMaxwellGUID))
                                 {
                                     temp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_ATTACK_UNARMED);
                                     temp->SetWalk(false);
@@ -1040,7 +1040,7 @@ public:
                                     temp->GetMotionMaster()->MovePoint(0, fLichPositionX, fLichPositionY, fLichPositionZ);
                                     temp->AI()->Talk(SAY_LIGHT_OF_DAWN50);
                                 }
-                                if (Creature* temp = Unit::GetCreature(*me, uiKorfaxGUID))
+                                if (Creature* temp = ObjectAccessor::GetCreature(*me, uiKorfaxGUID))
                                 {
                                     temp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_ATTACK_UNARMED);
                                     temp->SetWalk(false);
@@ -1048,7 +1048,7 @@ public:
                                     temp->HandleEmoteCommand(EMOTE_STATE_ATTACK_UNARMED);
                                     temp->GetMotionMaster()->MovePoint(0, fLichPositionX, fLichPositionY, fLichPositionZ);
                                 }
-                                if (Creature* temp = Unit::GetCreature(*me, uiEligorGUID))
+                                if (Creature* temp = ObjectAccessor::GetCreature(*me, uiEligorGUID))
                                 {
                                     temp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_ATTACK_UNARMED);
                                     temp->SetWalk(false);
@@ -1060,37 +1060,37 @@ public:
                             break;
 
                         case 43: // They all got kicked
-                            if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiLichKingGUID))
                                 temp->AI()->Talk(EMOTE_LIGHT_OF_DAWN13);
 
-                            if (Creature* temp = Unit::GetCreature(*me, uiMaxwellGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiMaxwellGUID))
                             {
                                 temp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
                                 temp->SetSpeed(MOVE_RUN, 6.0f);
                                 temp->SetStandState(UNIT_STAND_STATE_DEAD);
                                 temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[14].x, LightofDawnLoc[14].y, LightofDawnLoc[14].z);
                             }
-                            if (Creature* temp = Unit::GetCreature(*me, uiKorfaxGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiKorfaxGUID))
                             {
                                 temp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
                                 temp->SetSpeed(MOVE_RUN, 6.0f);
                                 temp->SetStandState(UNIT_STAND_STATE_DEAD);
                                 temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[11].x, LightofDawnLoc[11].y, LightofDawnLoc[11].z);
                             }
-                            if (Creature* temp = Unit::GetCreature(*me, uiEligorGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiEligorGUID))
                             {
                                 temp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
                                 temp->SetSpeed(MOVE_RUN, 6.0f);
                                 temp->SetStandState(UNIT_STAND_STATE_DEAD);
                                 temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[17].x, LightofDawnLoc[17].y, LightofDawnLoc[17].z);
                             }
-                            if (Creature* temp = Unit::GetCreature(*me, uiDefenderGUID[0]))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiDefenderGUID[0]))
                             {
                                 temp->SetSpeed(MOVE_RUN, 6.0f);
                                 temp->SetStandState(UNIT_STAND_STATE_DEAD);
                                 temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%10, LightofDawnLoc[0].y+rand()%10, LightofDawnLoc[0].z);
                             }
-                            if (Creature* temp = Unit::GetCreature(*me, uiEarthshatterGUID[0]))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiEarthshatterGUID[0]))
                             {
                                 temp->SetSpeed(MOVE_RUN, 6.0f);
                                 temp->SetStandState(UNIT_STAND_STATE_DEAD);
@@ -1100,11 +1100,11 @@ public:
                             break;
 
                         case 44: // make them stand up
-                            if (Creature* temp = Unit::GetCreature(*me, uiMaxwellGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiMaxwellGUID))
                                 temp->SetStandState(UNIT_STAND_STATE_STAND);
-                            if (Creature* temp = Unit::GetCreature(*me, uiKorfaxGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiKorfaxGUID))
                                 temp->SetStandState(UNIT_STAND_STATE_STAND);
-                            if (Creature* temp = Unit::GetCreature(*me, uiEligorGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiEligorGUID))
                                 temp->SetStandState(UNIT_STAND_STATE_STAND);
                             JumpToNextStep(1000);
                             break;
@@ -1126,7 +1126,7 @@ public:
                         case 47: // Ashbringer rebirth
                             me->SetStandState(UNIT_STAND_STATE_KNEEL);
                             Talk(EMOTE_LIGHT_OF_DAWN15);
-                            if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID))
                             {
                                 temp->SetStandState(UNIT_STAND_STATE_STAND);
                                 temp->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 0, uint32(EQUIP_HIGHLORD_TIRION_FORDRING));
@@ -1139,38 +1139,38 @@ public:
                             //if (GameObject* go = me->GetMap()->GetGameObject(uiDawnofLightGUID))
                             //    go->SetPhaseMask(128, true);
                             me->SummonGameObject(GO_LIGHT_OF_DAWN, 2283.896f, -5287.914f, 83.066f, 0, 0, 0, 0, 0, 30000);
-                            if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID))
                             {
                                 if (temp->HasAura(SPELL_REBIRTH_OF_THE_ASHBRINGER, 0))
                                     temp->RemoveAurasDueToSpell(SPELL_REBIRTH_OF_THE_ASHBRINGER);
                                 temp->CastSpell(temp, 41542, false); // workarounds, light expoded, makes it cool
                                 temp->HandleEmoteCommand(EMOTE_ONESHOT_ROAR);
                             }
-                            if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiLichKingGUID))
                                 temp->InterruptNonMeleeSpells(false);
                             JumpToNextStep(2500);
                             break;
 
                         case 49:
-                            if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN54);
                             JumpToNextStep(4000);
                             break;
 
                         case 50:
-                            if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiLichKingGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN55);
                             JumpToNextStep(5000);
                             break;
 
                         case 51:
-                            if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN56);
                             JumpToNextStep(1000);
                             break;
 
                         case 52: // Tiron charges
-                            if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID))
                             {
                                 temp->AI()->Talk(EMOTE_LIGHT_OF_DAWN16);
                                 temp->CastSpell(temp, SPELL_TIRION_CHARGE, false); // jumping charge
@@ -1178,20 +1178,20 @@ public:
                                 temp->SetSpeed(MOVE_RUN, 3.0f); // workarounds, make Tirion still running
                                 temp->SetWalk(false);
                                 temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[2].x, LightofDawnLoc[2].y, LightofDawnLoc[2].z);
-                                if (Creature* lktemp = Unit::GetCreature(*me, uiLichKingGUID))
+                                if (Creature* lktemp = ObjectAccessor::GetCreature(*me, uiLichKingGUID))
                                     lktemp->Relocate(LightofDawnLoc[28].x, LightofDawnLoc[28].y, LightofDawnLoc[28].z); // workarounds, he should kick back by Tirion, but here we relocate him
                             }
                             JumpToNextStep(1500);
                             break;
 
                         case 53:
-                            if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiLichKingGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN57);
                             JumpToNextStep(1000);
                             break;
 
                         case 54:
-                            if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiLichKingGUID))
                             {
                                 temp->SetSpeed(MOVE_RUN, 1.0f);
                                 me->SetWalk(true);
@@ -1201,33 +1201,33 @@ public:
                             break;
 
                         case 55:
-                            if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiLichKingGUID))
                                 temp->SetStandState(UNIT_STAND_STATE_KNEEL);
                             JumpToNextStep(2000);
                             break;
 
                         case 56:
-                            if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiLichKingGUID))
                                 temp->SetStandState(UNIT_STAND_STATE_STAND);
                             JumpToNextStep(1500);
                             break;
 
                         case 57:
-                            if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiLichKingGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN58);
                             JumpToNextStep(10000);
                             break;
 
                         case 58:
-                            if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiLichKingGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN59);
                             JumpToNextStep(10000);
                             break;
 
                         case 59:
-                            if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiLichKingGUID))
                                 temp->CastSpell(temp, SPELL_TELEPORT_VISUAL, false);
-                            if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID)) // Tirion runs to Darion
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID)) // Tirion runs to Darion
                             {
                                 temp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
                                 temp->SetSpeed(MOVE_RUN, 1.0f);
@@ -1237,7 +1237,7 @@ public:
                             break;
 
                         case 60:
-                            if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID)) // Lich king disappears here
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiLichKingGUID)) // Lich king disappears here
                             {
                                 temp->AI()->Talk(EMOTE_LIGHT_OF_DAWN17);
                                 temp->Kill(temp);
@@ -1246,13 +1246,13 @@ public:
                             break;
 
                         case 61:
-                            if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN60);
                             JumpToNextStep(3000);
                             break;
 
                         case 62:
-                            if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID))
                             {
                                 temp->SetWalk(true);
                                 temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[7].x, LightofDawnLoc[7].y, LightofDawnLoc[7].z);
@@ -1261,7 +1261,7 @@ public:
                             break;
 
                         case 63:
-                            if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID))
                             {
                                 temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[8].x, LightofDawnLoc[8].y, LightofDawnLoc[8].z);
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN61);
@@ -1270,37 +1270,37 @@ public:
                             break;
 
                         case 64:
-                            if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN62);
                             JumpToNextStep(7000);
                             break;
 
                         case 65:
-                            if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN63);
                             JumpToNextStep(10000);
                             break;
 
                         case 66:
-                            if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN64);
                             JumpToNextStep(11000);
                             break;
 
                         case 67:
-                            if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN65);
                             JumpToNextStep(10000);
                             break;
 
                         case 68:
-                            if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN66);
                             JumpToNextStep(8000);
                             break;
 
                         case 69:
-                            if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID))
                                 temp->AI()->Talk(SAY_LIGHT_OF_DAWN67);
                             JumpToNextStep(10000);
                             break;
@@ -1335,13 +1335,13 @@ public:
                             break;
 
                         case 73:
-                            if (Creature* temp = Unit::GetCreature(*me, uiKoltiraGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiKoltiraGUID))
                                 temp->DespawnOrUnsummon();
-                            if (Creature* temp = Unit::GetCreature(*me, uiOrbazGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiOrbazGUID))
                                 temp->DespawnOrUnsummon();
-                            if (Creature* temp = Unit::GetCreature(*me, uiThassarianGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiThassarianGUID))
                                 temp->DespawnOrUnsummon();
-                            if (Creature* temp = Unit::GetCreature(*me, uiLichKingGUID))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, uiLichKingGUID))
                                 temp->DespawnOrUnsummon();
                             me->DespawnOrUnsummon();
                             break;
@@ -1452,7 +1452,7 @@ public:
                     for (uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
                         DespawnNPC(uiWarriorGUID[i]);
 
-                    if (Creature* temp = Unit::GetCreature(*me, uiKorfaxGUID))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiKorfaxGUID))
                     {
                         temp->RemoveAllAuras();
                         temp->DeleteThreatList();
@@ -1463,7 +1463,7 @@ public:
                         temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[9].x, LightofDawnLoc[9].y, LightofDawnLoc[9].z);
                     }
 
-                    if (Creature* temp = Unit::GetCreature(*me, uiMaxwellGUID))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiMaxwellGUID))
                     {
                         temp->RemoveAllAuras();
                         temp->DeleteThreatList();
@@ -1474,7 +1474,7 @@ public:
                         temp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[12].x, LightofDawnLoc[12].y, LightofDawnLoc[12].z);
                     }
 
-                    if (Creature* temp = Unit::GetCreature(*me, uiEligorGUID))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiEligorGUID))
                     {
                         temp->RemoveAllAuras();
                         temp->DeleteThreatList();
@@ -1486,7 +1486,7 @@ public:
                     }
                     DespawnNPC(uiRayneGUID);
 
-                    if (Creature* temp = Unit::GetCreature(*me, uiKoltiraGUID))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiKoltiraGUID))
                     {
                         temp->RemoveAllAuras();
                         temp->DeleteThreatList();
@@ -1498,10 +1498,10 @@ public:
                         temp->CastSpell(temp, SPELL_THE_LIGHT_OF_DAWN, false);
                     }
 
-                    if (Creature* temp = Unit::GetCreature(*me, uiOrbazGUID))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiOrbazGUID))
                         temp->AI()->Talk(EMOTE_LIGHT_OF_DAWN04);
 
-                    if (Creature* temp = Unit::GetCreature(*me, uiThassarianGUID))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiThassarianGUID))
                     {
                         temp->RemoveAllAuras();
                         temp->DeleteThreatList();
@@ -1513,7 +1513,7 @@ public:
                         temp->CastSpell(temp, SPELL_THE_LIGHT_OF_DAWN, false);
                     }
 
-                    if (Creature* temp = Unit::GetCreature(*me, uiTirionGUID))
+                    if (Creature* temp = ObjectAccessor::GetCreature(*me, uiTirionGUID))
                         temp->AI()->Talk(SAY_LIGHT_OF_DAWN26);
 
                     SetHoldState(false);
@@ -1532,7 +1532,7 @@ public:
 
         void NPCChangeTarget(uint64 ui_GUID)
         {
-            if (Creature* temp = Unit::GetCreature(*me, ui_GUID))
+            if (Creature* temp = ObjectAccessor::GetCreature(*me, ui_GUID))
                 if (temp->IsAlive())
                     if (Unit* pTarger = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         if (pTarger->IsAlive())
@@ -1553,7 +1553,7 @@ public:
             // Death
             for (uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
             {
-                temp = Unit::GetCreature(*me, uiGhoulGUID[i]);
+                temp = ObjectAccessor::GetCreature(*me, uiGhoulGUID[i]);
                 if (!temp)
                 {
                     temp = me->SummonCreature(NPC_ACHERUS_GHOUL, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
@@ -1563,7 +1563,7 @@ public:
             }
             for (uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
             {
-                temp = Unit::GetCreature(*me, uiAbominationGUID[i]);
+                temp = ObjectAccessor::GetCreature(*me, uiAbominationGUID[i]);
                 if (!temp)
                 {
                     temp = me->SummonCreature(NPC_WARRIOR_OF_THE_FROZEN_WASTES, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
@@ -1573,7 +1573,7 @@ public:
             }
             for (uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
             {
-                temp = Unit::GetCreature(*me, uiWarriorGUID[i]);
+                temp = ObjectAccessor::GetCreature(*me, uiWarriorGUID[i]);
                 if (!temp)
                 {
                     temp = me->SummonCreature(NPC_RAMPAGING_ABOMINATION, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
@@ -1583,7 +1583,7 @@ public:
             }
             for (uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
             {
-                temp = Unit::GetCreature(*me, uiBehemothGUID[i]);
+                temp = ObjectAccessor::GetCreature(*me, uiBehemothGUID[i]);
                 if (!temp)
                 {
                     temp = me->SummonCreature(NPC_FLESH_BEHEMOTH, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
@@ -1595,7 +1595,7 @@ public:
             // Dawn
             for (uint8 i = 0; i < ENCOUNTER_DEFENDER_NUMBER; ++i)
             {
-                temp = Unit::GetCreature(*me, uiDefenderGUID[i]);
+                temp = ObjectAccessor::GetCreature(*me, uiDefenderGUID[i]);
                 if (!temp)
                 {
                     temp = me->SummonCreature(NPC_DEFENDER_OF_THE_LIGHT, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
@@ -1606,7 +1606,7 @@ public:
             }
             for (uint8 i = 0; i < ENCOUNTER_EARTHSHATTER_NUMBER; ++i)
             {
-                temp = Unit::GetCreature(*me, uiEarthshatterGUID[i]);
+                temp = ObjectAccessor::GetCreature(*me, uiEarthshatterGUID[i]);
                 if (!temp)
                 {
                     temp = me->SummonCreature(NPC_RIMBLAT_EARTHSHATTER, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
@@ -1615,7 +1615,7 @@ public:
                     uiEarthshatterGUID[i] = temp->GetGUID();
                 }
             }
-            temp = Unit::GetCreature(*me, uiKorfaxGUID);
+            temp = ObjectAccessor::GetCreature(*me, uiKorfaxGUID);
             if (!temp)
             {
                 temp = me->SummonCreature(NPC_KORFAX_CHAMPION_OF_THE_LIGHT, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000);
@@ -1623,7 +1623,7 @@ public:
                 me->AddThreat(temp, 0.0f);
                 uiKorfaxGUID = temp->GetGUID();
             }
-            temp = Unit::GetCreature(*me, uiMaxwellGUID);
+            temp = ObjectAccessor::GetCreature(*me, uiMaxwellGUID);
             if (!temp)
             {
                 temp = me->SummonCreature(NPC_LORD_MAXWELL_TYROSUS, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000);
@@ -1631,7 +1631,7 @@ public:
                 me->AddThreat(temp, 0.0f);
                 uiMaxwellGUID = temp->GetGUID();
             }
-            temp = Unit::GetCreature(*me, uiEligorGUID);
+            temp = ObjectAccessor::GetCreature(*me, uiEligorGUID);
             if (!temp)
             {
                 temp = me->SummonCreature(NPC_COMMANDER_ELIGOR_DAWNBRINGER, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000);
@@ -1639,7 +1639,7 @@ public:
                 me->AddThreat(temp, 0.0f);
                 uiEligorGUID = temp->GetGUID();
             }
-            temp = Unit::GetCreature(*me, uiRayneGUID);
+            temp = ObjectAccessor::GetCreature(*me, uiRayneGUID);
             if (!temp)
             {
                 temp = me->SummonCreature(NPC_RAYNE, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
@@ -1651,7 +1651,7 @@ public:
 
         void DespawnNPC(uint64 pGUID)
         {
-            if (Creature* temp = Unit::GetCreature(*me, pGUID))
+            if (Creature* temp = ObjectAccessor::GetCreature(*me, pGUID))
                 if (temp->IsAlive())
                 {
                     temp->SetVisible(false);

src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp

@@ -356,7 +356,7 @@ public:
                     if (wait <= diff)
                     {
                         die = false;
-                        if (Unit* body = Unit::GetUnit(*me, bodyGUID))
+                        if (Unit* body = ObjectAccessor::GetUnit(*me, bodyGUID))
                             body->Kill(body);
                         me->Kill(me);
                     }
@@ -428,7 +428,7 @@ public:
             DoCast(me, SPELL_HEAD);
             if (headGUID)
             {
-                if (Creature* Head = Unit::GetCreature((*me), headGUID))
+                if (Creature* Head = ObjectAccessor::GetCreature((*me), headGUID))
                     Head->DisappearAndDie();
 
                 headGUID = 0;
@@ -483,7 +483,7 @@ public:
                     wp_reached = false;
                     me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                     SaySound(SAY_ENTRANCE);
-                    if (Unit* player = Unit::GetUnit(*me, PlayerGUID))
+                    if (Unit* player = ObjectAccessor::GetUnit(*me, PlayerGUID))
                         DoStartMovement(player);
                     break;
                 }
@@ -516,7 +516,7 @@ public:
                 if (withhead)
                     SaySound(SAY_PLAYER_DEATH);
                 //maybe possible when player dies from conflagration
-                else if (Creature* Head = Unit::GetCreature((*me), headGUID))
+                else if (Creature* Head = ObjectAccessor::GetCreature((*me), headGUID))
                     CAST_AI(npc_head::npc_headAI, Head->AI())->SaySound(SAY_PLAYER_DEATH);
             }
         }
@@ -601,7 +601,7 @@ public:
                 ThreatContainer::StorageType threatlist = caster->getThreatManager().getThreatList();
                 for (ThreatContainer::StorageType::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr)
                 {
-                    Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid());
+                    Unit* unit = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid());
                     if (unit && unit->IsAlive() && unit != caster)
                         me->AddThreat(unit, caster->getThreatManager().getThreat(unit));
                 }
@@ -621,7 +621,7 @@ public:
                 if (!headGUID)
                     headGUID = DoSpawnCreature(HEAD, float(rand()%6), float(rand()%6), 0, 0, TEMPSUMMON_DEAD_DESPAWN, 0)->GetGUID();
 
-                Unit* Head = Unit::GetUnit(*me, headGUID);
+                Unit* Head = ObjectAccessor::GetUnit(*me, headGUID);
                 if (Head && Head->IsAlive())
                 {
                     Head->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -746,7 +746,7 @@ public:
                             --Phase;
                         else
                             Phase = 1;
-                        Creature* Head = Unit::GetCreature((*me), headGUID);
+                        Creature* Head = ObjectAccessor::GetCreature((*me), headGUID);
                         if (Head && Head->IsAlive())
                         {
                             CAST_AI(npc_head::npc_headAI, Head->AI())->Phase = Phase;
@@ -837,7 +837,7 @@ public:
             if (!debuffGUID)
                 return;
 
-            Unit* debuff = Unit::GetUnit(*me, debuffGUID);
+            Unit* debuff = ObjectAccessor::GetUnit(*me, debuffGUID);
             if (debuff)
             {
                 debuff->SetVisible(false);
@@ -909,7 +909,7 @@ void npc_head::npc_headAI::Disappear()
 
     if (bodyGUID)
     {
-        Creature* body = Unit::GetCreature((*me), bodyGUID);
+        Creature* body = ObjectAccessor::GetCreature((*me), bodyGUID);
         if (body && body->IsAlive())
         {
             withbody = true;

src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp

@@ -84,7 +84,7 @@ public:
         void JustDied(Unit* /*killer*/) override
         {
             //Any other Actions to do with vorrel? setStandState?
-            if (Creature* vorrel = Creature::GetCreature(*me, instance->GetData64(DATA_VORREL)))
+            if (Creature* vorrel = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_VORREL)))
                 vorrel->AI()->Talk(SAY_TRIGGER_VORREL);
         }
 

src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp

@@ -127,7 +127,7 @@ public:
                 return;
 
             //On first death, fake death and open door, as well as initiate whitemane if exist
-            if (Unit* Whitemane = Unit::GetUnit(*me, instance->GetData64(DATA_WHITEMANE)))
+            if (Unit* Whitemane = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_WHITEMANE)))
             {
                 instance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, IN_PROGRESS);
 
@@ -175,7 +175,7 @@ public:
             if (_bHasDied && !_bHeal && instance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT) == SPECIAL)
             {
                 //On ressurection, stop fake death and heal whitemane and resume fight
-                if (Unit* Whitemane = Unit::GetUnit(*me, instance->GetData64(DATA_WHITEMANE)))
+                if (Unit* Whitemane = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_WHITEMANE)))
                 {
                     me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                     me->SetStandState(UNIT_STAND_STATE_STAND);
@@ -325,7 +325,7 @@ public:
                 if (!HealthAbovePct(75))
                     target = me;
 
-                if (Creature* mograine = Unit::GetCreature(*me, instance->GetData64(DATA_MOGRAINE)))
+                if (Creature* mograine = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MOGRAINE)))
                 {
                     // checking _bCanResurrectCheck prevents her healing Mograine while he is "faking death"
                     if (_bCanResurrectCheck && mograine->IsAlive() && !mograine->HealthAbovePct(75))

src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp

@@ -187,7 +187,7 @@ public:
             {
                 if (Die_Timer <= diff)
                 {
-                    if (Unit* temp = Unit::GetUnit(*me, Tagger))
+                    if (Unit* temp = ObjectAccessor::GetUnit(*me, Tagger))
                     {
                         if (Player* player = temp->ToPlayer())
                             player->KilledMonsterCredit(NPC_RESTLESS, me->GetGUID());

src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp

@@ -280,7 +280,7 @@ public:
                 {
                     Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true);
                     if (!target)
-                        target = Unit::GetUnit(*me, instance->GetData64(DATA_PLAYER_GUID));
+                        target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_PLAYER_GUID));
 
                     if (!target)
                     {
@@ -306,7 +306,7 @@ public:
 
                     Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true);
                     if (!target)
-                        target = Unit::GetUnit(*me, instance->GetData64(DATA_PLAYER_GUID));
+                        target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_PLAYER_GUID));
 
                     if (!target)
                     {
@@ -335,7 +335,7 @@ public:
                 {
                     Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true);
                     if (!target)
-                        target = Unit::GetUnit(*me, instance->GetData64(DATA_PLAYER_GUID));
+                        target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_PLAYER_GUID));
 
                     if (!target)
                     {

src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp

@@ -766,7 +766,7 @@ public:
                 ThreatContainer::StorageType threatlist = me->getThreatManager().getThreatList();
                 for (ThreatContainer::StorageType::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr)
                 {
-                    if (Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid()))
+                    if (Unit* unit = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid()))
                         if (unit->GetPositionZ() > me->GetPositionZ() + 5)
                             me->getThreatManager().modifyThreatPercent(unit, -100);
                 }

src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp

@@ -956,7 +956,7 @@ public:
                     ThreatContainer::StorageType const &threatlist = me->getThreatManager().getThreatList();
                     for (ThreatContainer::StorageType::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr)
                     {
-                        Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid());
+                        Unit* unit = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid());
                         if (unit)
                             pPortal->AddThreat(unit, 1.0f);
                     }

src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp

@@ -603,7 +603,7 @@ public:
         {
             if (SpellTimer <= diff)
             {
-                Unit* Victim = Unit::GetUnit(*me, instance->GetData64(DATA_PLAYER_GUID));
+                Unit* Victim = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_PLAYER_GUID));
                 switch (NeedForAHack)
                 {
                     case 0:

src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp

@@ -94,7 +94,7 @@ class boss_archaedas : public CreatureScript
 
             void ActivateMinion(uint64 uiGuid, bool flag)
             {
-                Unit* minion = Unit::GetUnit(*me, uiGuid);
+                Unit* minion = ObjectAccessor::GetUnit(*me, uiGuid);
 
                 if (minion && minion->IsAlive())
                 {
@@ -139,7 +139,7 @@ class boss_archaedas : public CreatureScript
                 } else if (bWakingUp && iAwakenTimer <= 0)
                 {
                     bWakingUp = false;
-                    AttackStart(Unit::GetUnit(*me, instance->GetData64(0)));
+                    AttackStart(ObjectAccessor::GetUnit(*me, instance->GetData64(0)));
                     return;     // dont want to continue until we finish the AttackStart method
                 }
 
@@ -285,7 +285,7 @@ class npc_archaedas_minions : public CreatureScript
                 {
                     bWakingUp = false;
                     bAmIAwake = true;
-                    // AttackStart(Unit::GetUnit(*me, instance->GetData64(0))); // whoWokeArchaedasGUID
+                    // AttackStart(ObjectAccessor::GetUnit(*me, instance->GetData64(0))); // whoWokeArchaedasGUID
                     return;     // dont want to continue until we finish the AttackStart method
                 }
 

src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp

@@ -252,7 +252,7 @@ class instance_uldaman : public InstanceMapScript
                 if (!archaedas)
                     return;
 
-                if (Unit::GetUnit(*archaedas, target))
+                if (ObjectAccessor::GetUnit(*archaedas, target))
                 {
                     archaedas->CastSpell(archaedas, SPELL_ARCHAEDAS_AWAKEN, false);
                     whoWokeuiArchaedasGUID = target;

src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp

@@ -304,13 +304,13 @@ class boss_akilzon : public CreatureScript
                             break;
                         case EVENT_STORM_SEQUENCE:
                             {
-                                Unit* target = Unit::GetUnit(*me, CloudGUID);
+                                Unit* target = ObjectAccessor::GetUnit(*me, CloudGUID);
                                 if (!target || !target->IsAlive())
                                 {
                                     EnterEvadeMode();
                                     return;
                                 }
-                                else if (Unit* Cyclone = Unit::GetUnit(*me, CycloneGUID))
+                                else if (Unit* Cyclone = ObjectAccessor::GetUnit(*me, CycloneGUID))
                                     Cyclone->CastSpell(target, SPELL_SAND_STORM, true); // keep casting or...
                                 HandleStormSequence(target);
                                 break;
@@ -323,7 +323,7 @@ class boss_akilzon : public CreatureScript
 
                             for (uint8 i = 0; i < 8; ++i)
                             {
-                                Unit* bird = Unit::GetUnit(*me, BirdGUIDs[i]);
+                                Unit* bird = ObjectAccessor::GetUnit(*me, BirdGUIDs[i]);
                                 if (!bird) //they despawned on die
                                 {
                                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
@@ -406,7 +406,7 @@ class npc_akilzon_eagle : public CreatureScript
                 arrived = true;
                 if (TargetGUID)
                 {
-                    if (Unit* target = Unit::GetUnit(*me, TargetGUID))
+                    if (Unit* target = ObjectAccessor::GetUnit(*me, TargetGUID))
                         DoCast(target, SPELL_EAGLE_SWOOP, true);
                     TargetGUID = 0;
                     me->SetSpeed(MOVE_RUN, 1.2f);

src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp

@@ -152,7 +152,7 @@ class boss_halazzi : public CreatureScript
                         me->Attack(me->GetVictim(), true);
                         me->GetMotionMaster()->MoveChase(me->GetVictim());
                     }
-                    if (Creature* Lynx = Unit::GetCreature(*me, LynxGUID))
+                    if (Creature* Lynx = ObjectAccessor::GetCreature(*me, LynxGUID))
                         Lynx->DisappearAndDie();
                     me->SetMaxHealth(600000);
                     me->SetHealth(600000 - 150000 * TransformCount);
@@ -174,7 +174,7 @@ class boss_halazzi : public CreatureScript
                     TotemTimer = 12000;
                     break;
                 case PHASE_MERGE:
-                    if (Unit* pLynx = Unit::GetUnit(*me, LynxGUID))
+                    if (Unit* pLynx = ObjectAccessor::GetUnit(*me, LynxGUID))
                     {
                         Talk(SAY_MERGE);
                         pLynx->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -259,7 +259,7 @@ class boss_halazzi : public CreatureScript
                                 EnterPhase(PHASE_MERGE);
                             else
                             {
-                                Unit* Lynx = Unit::GetUnit(*me, LynxGUID);
+                                Unit* Lynx = ObjectAccessor::GetUnit(*me, LynxGUID);
                                 if (Lynx && !Lynx->HealthAbovePct(20) /*Lynx->HealthBelowPct(10)*/)
                                     EnterPhase(PHASE_MERGE);
                             }
@@ -272,7 +272,7 @@ class boss_halazzi : public CreatureScript
                 {
                     if (CheckTimer <= diff)
                     {
-                        Unit* Lynx = Unit::GetUnit(*me, LynxGUID);
+                        Unit* Lynx = ObjectAccessor::GetUnit(*me, LynxGUID);
                         if (Lynx)
                         {
                             Lynx->GetMotionMaster()->MoveFollow(me, 0, 0);

src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp

@@ -303,7 +303,7 @@ class boss_hexlord_malacrass : public CreatureScript
 
                 for (uint8 i = 0; i < 4; ++i)
                 {
-                    Creature* creature = Unit::GetCreature(*me, AddGUID[i]);
+                    Creature* creature = ObjectAccessor::GetCreature(*me, AddGUID[i]);
                     if (creature && creature->IsAlive())
                         creature->AI()->AttackStart(me->GetVictim());
                     else
@@ -338,7 +338,7 @@ class boss_hexlord_malacrass : public CreatureScript
 
                 for (uint8 i = 0; i < 4; ++i)
                 {
-                    Unit* Temp = Unit::GetUnit(*me, AddGUID[i]);
+                    Unit* Temp = ObjectAccessor::GetUnit(*me, AddGUID[i]);
                     if (Temp && Temp->IsAlive())
                         Temp->DealDamage(Temp, Temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
                 }
@@ -363,7 +363,7 @@ class boss_hexlord_malacrass : public CreatureScript
             {
                 for (uint8 i = 0; i < 4; ++i)
                 {
-                    Creature* creature = (Unit::GetCreature((*me), AddGUID[i]));
+                    Creature* creature = (ObjectAccessor::GetCreature((*me), AddGUID[i]));
                     if (!creature || !creature->IsAlive())
                     {
                         if (creature) creature->setDeathState(DEAD);
@@ -397,7 +397,7 @@ class boss_hexlord_malacrass : public CreatureScript
                 if (CheckAddState_Timer <= diff)
                 {
                     for (uint8 i = 0; i < 4; ++i)
-                        if (Creature* temp = Unit::GetCreature(*me, AddGUID[i]))
+                        if (Creature* temp = ObjectAccessor::GetCreature(*me, AddGUID[i]))
                             if (temp->IsAlive() && !temp->GetVictim())
                                 temp->AI()->AttackStart(me->GetVictim());
 
@@ -462,7 +462,7 @@ class boss_hexlord_malacrass : public CreatureScript
 
                 if (PlayerAbility_Timer <= diff)
                 {
-                    //Unit* target = Unit::GetUnit(*me, PlayerGUID);
+                    //Unit* target = ObjectAccessor::GetUnit(*me, PlayerGUID);
                     //if (target && target->IsAlive())
                     //{
                         UseAbility();

src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp

@@ -292,7 +292,7 @@ class boss_janalai : public CreatureScript
             {
                 if (BombCount < 40)
                 {
-                    if (Unit* FireBomb = Unit::GetUnit(*me, FireBombGUIDs[BombCount]))
+                    if (Unit* FireBomb = ObjectAccessor::GetUnit(*me, FireBombGUIDs[BombCount]))
                     {
                         FireBomb->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                         DoCast(FireBomb, SPELL_FIRE_BOMB_THROW, true);

src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp

@@ -229,7 +229,7 @@ class boss_zuljin : public CreatureScript
                 Talk(YELL_DEATH);
                 Summons.DespawnEntry(CREATURE_COLUMN_OF_FIRE);
 
-                if (Unit* Temp = Unit::GetUnit(*me, SpiritGUID[3]))
+                if (Unit* Temp = ObjectAccessor::GetUnit(*me, SpiritGUID[3]))
                     Temp->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_DEAD);
             }
 
@@ -284,7 +284,7 @@ class boss_zuljin : public CreatureScript
                 {
                     if (SpiritGUID[i])
                     {
-                        if (Unit* temp = Unit::GetUnit(*me, SpiritGUID[i]))
+                        if (Unit* temp = ObjectAccessor::GetUnit(*me, SpiritGUID[i]))
                         {
                             temp->SetVisible(false);
                             temp->setDeathState(DEAD);
@@ -322,10 +322,10 @@ class boss_zuljin : public CreatureScript
                     Talk(Transform[Phase].text);
                     if (Phase > 0)
                     {
-                        if (Unit* Temp = Unit::GetUnit(*me, SpiritGUID[Phase - 1]))
+                        if (Unit* Temp = ObjectAccessor::GetUnit(*me, SpiritGUID[Phase - 1]))
                             Temp->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_DEAD);
                     }
-                    if (Unit* Temp = Unit::GetUnit(*me, SpiritGUID[NextPhase - 1]))
+                    if (Unit* Temp = ObjectAccessor::GetUnit(*me, SpiritGUID[NextPhase - 1]))
                         Temp->CastSpell(me, SPELL_SIPHON_SOUL, false); // should m cast on temp
                     if (NextPhase == 2)
                     {
@@ -442,7 +442,7 @@ class boss_zuljin : public CreatureScript
                             if (Claw_Loop_Timer <= diff)
                             {
                                 Unit* target = me->GetVictim();
-                                if (!target || !target->isTargetableForAttack()) target = Unit::GetUnit(*me, TankGUID);
+                                if (!target || !target->isTargetableForAttack()) target = ObjectAccessor::GetUnit(*me, TankGUID);
                                 if (!target || !target->isTargetableForAttack()) target = SelectTarget(SELECT_TARGET_RANDOM, 0);
                                 if (target)
                                 {
@@ -455,7 +455,7 @@ class boss_zuljin : public CreatureScript
                                         {
                                             Claw_Rage_Timer = urand(15000, 20000);
                                             me->SetSpeed(MOVE_RUN, 1.2f);
-                                            AttackStart(Unit::GetUnit(*me, TankGUID));
+                                            AttackStart(ObjectAccessor::GetUnit(*me, TankGUID));
                                             TankGUID = 0;
                                             return;
                                         }
@@ -503,7 +503,7 @@ class boss_zuljin : public CreatureScript
                                     {
                                         Lynx_Rush_Timer = urand(15000, 20000);
                                         me->SetSpeed(MOVE_RUN, 1.2f);
-                                        AttackStart(Unit::GetUnit(*me, TankGUID));
+                                        AttackStart(ObjectAccessor::GetUnit(*me, TankGUID));
                                         TankGUID = 0;
                                     }
                                     else

src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp

@@ -344,7 +344,7 @@ class npc_zulian_prowler : public CreatureScript
                 DoCast(me, SPELL_SNEAK_RANK_1_1);
                 DoCast(me, SPELL_SNEAK_RANK_1_2);
 
-                if (Unit* arlokk = me->GetUnit(*me, _instance->GetData64(NPC_ARLOKK)))
+                if (Unit* arlokk = ObjectAccessor::GetUnit(*me, _instance->GetData64(NPC_ARLOKK)))
                     me->GetMotionMaster()->MovePoint(0, arlokk->GetPositionX(), arlokk->GetPositionY(), arlokk->GetPositionZ());
                 _events.ScheduleEvent(EVENT_ATTACK, 6000);
             }

src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp

@@ -252,7 +252,7 @@ public:
         {
             me->DisappearAndDie();
 
-            if (Creature* pMarzon = Unit::GetCreature(*me, MarzonGUID))
+            if (Creature* pMarzon = ObjectAccessor::GetCreature(*me, MarzonGUID))
             {
                 if (pMarzon->IsAlive())
                     pMarzon->DisappearAndDie();
@@ -261,7 +261,7 @@ public:
 
         void EnterCombat(Unit* who) override
         {
-            if (Creature* pMarzon = Unit::GetCreature(*me, MarzonGUID))
+            if (Creature* pMarzon = ObjectAccessor::GetCreature(*me, MarzonGUID))
             {
                 if (pMarzon->IsAlive() && !pMarzon->IsInCombat())
                     pMarzon->AI()->AttackStart(who);
@@ -335,7 +335,7 @@ public:
                             uiPhase = 0;
                             break;
                         case 5:
-                            if (Creature* pMarzon = Unit::GetCreature(*me, MarzonGUID))
+                            if (Creature* pMarzon = ObjectAccessor::GetCreature(*me, MarzonGUID))
                                 pMarzon->AI()->Talk(SAY_MARZON_1);
                             uiTimer = 3000;
                             uiPhase = 6;
@@ -350,7 +350,7 @@ public:
                         case 7:
                             if (Creature* pTyrion = me->FindNearestCreature(NPC_TYRION, 20.0f, true))
                                 pTyrion->AI()->Talk(SAY_TYRION_2);
-                            if (Creature* pMarzon = Unit::GetCreature(*me, MarzonGUID))
+                            if (Creature* pMarzon = ObjectAccessor::GetCreature(*me, MarzonGUID))
                                 pMarzon->setFaction(14);
                             me->setFaction(14);
                             uiTimer = 0;

src/server/scripts/EasternKingdoms/zone_undercity.cpp

@@ -130,7 +130,7 @@ public:
         {
             if (summoned->GetEntry() == ENTRY_HIGHBORNE_BUNNY)
             {
-                if (Creature* target = Unit::GetCreature(*summoned, targetGUID))
+                if (Creature* target = ObjectAccessor::GetCreature(*summoned, targetGUID))
                 {
                     target->MonsterMoveWithSpeed(target->GetPositionX(), target->GetPositionY(), me->GetPositionZ()+15.0f, 0);
                     target->SetPosition(target->GetPositionX(), target->GetPositionY(), me->GetPositionZ()+15.0f, 0.0f);

src/server/scripts/Events/childrens_week.cpp

@@ -1036,7 +1036,7 @@ class npc_grizzlemaw_cw_trigger : public CreatureScript
                 if (who && who->GetDistance2d(me) < 10.0f)
                     if (Player* player = who->ToPlayer())
                         if (player->GetQuestStatus(QUEST_HOME_OF_THE_BEAR_MEN) == QUEST_STATUS_INCOMPLETE)
-                            if (Creature* orphan = Creature::GetCreature(*me, getOrphanGUID(player, ORPHAN_WOLVAR)))
+                            if (Creature* orphan = ObjectAccessor::GetCreature(*me, getOrphanGUID(player, ORPHAN_WOLVAR)))
                             {
                                 player->AreaExploredOrEventHappens(QUEST_HOME_OF_THE_BEAR_MEN);
                                 orphan->AI()->Talk(TEXT_WOLVAR_ORPHAN_10);

src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp

@@ -94,7 +94,7 @@ public:
         {
             if (waypointId == 7)
             {
-                Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
+                Unit* target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
                 if (target && target->IsAlive())
                     me->AddThreat(target, 0.0f);
             }

src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp

@@ -118,7 +118,7 @@ public:
         {
             if (CheckTimer <= diff)
             {
-                if (Unit* Archimonde = Unit::GetUnit(*me, ArchimondeGUID))
+                if (Unit* Archimonde = ObjectAccessor::GetUnit(*me, ArchimondeGUID))
                 {
                     if (Archimonde->HealthBelowPct(2) || !Archimonde->IsAlive())
                         DoCast(me, SPELL_DENOUEMENT_WISP);
@@ -205,7 +205,7 @@ public:
         {
             if (ChangeTargetTimer <= diff)
             {
-                if (Unit* temp = Unit::GetUnit(*me, TargetGUID))
+                if (Unit* temp = ObjectAccessor::GetUnit(*me, TargetGUID))
                 {
                     me->GetMotionMaster()->MoveFollow(temp, 0.0f, 0.0f);
                     TargetGUID = 0;
@@ -364,7 +364,7 @@ public:
             ThreatContainer::StorageType::const_iterator itr = threatlist.begin();
             for (; itr != threatlist.end(); ++itr)
             {
-                Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid());
+                Unit* unit = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid());
                 if (unit && unit->IsAlive())
                     targets.push_back(unit);
             }
@@ -406,7 +406,7 @@ public:
                 summoned->CastSpell(summoned, SPELL_DOOMFIRE_SPAWN, false);
                 summoned->CastSpell(summoned, SPELL_DOOMFIRE, true, 0, 0, me->GetGUID());
 
-                if (Unit* DoomfireSpirit = Unit::GetUnit(*me, DoomfireSpiritGUID))
+                if (Unit* DoomfireSpirit = ObjectAccessor::GetUnit(*me, DoomfireSpiritGUID))
                 {
                     summoned->GetMotionMaster()->MoveFollow(DoomfireSpirit, 0.0f, 0.0f);
                     DoomfireSpiritGUID = 0;
@@ -487,7 +487,7 @@ public:
                         if (temp)
                             WorldTreeGUID = temp->GetGUID();
 
-                        if (Unit* Nordrassil = Unit::GetUnit(*me, WorldTreeGUID))
+                        if (Unit* Nordrassil = ObjectAccessor::GetUnit(*me, WorldTreeGUID))
                         {
                             Nordrassil->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                             Nordrassil->SetDisplayId(11686);
@@ -496,7 +496,7 @@ public:
                         }
                     }
 
-                    if (Unit* Nordrassil = Unit::GetUnit(*me, WorldTreeGUID))
+                    if (Unit* Nordrassil = ObjectAccessor::GetUnit(*me, WorldTreeGUID))
                     {
                         Nordrassil->CastSpell(me, SPELL_DRAIN_WORLD_TREE_2, true);
                         DrainNordrassilTimer = 1000;

src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp

@@ -99,7 +99,7 @@ public:
         {
             if (waypointId == 7 && instance)
             {
-                Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
+                Unit* target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_THRALL));
                 if (target && target->IsAlive())
                     me->AddThreat(target, 0.0f);
             }

src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp

@@ -94,7 +94,7 @@ public:
         {
             if (waypointId == 7 && instance)
             {
-                Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
+                Unit* target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_THRALL));
                 if (target && target->IsAlive())
                     me->AddThreat(target, 0.0f);
             }

src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp

@@ -89,7 +89,7 @@ public:
         {
             if (waypointId == 7 && instance)
             {
-                Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
+                Unit* target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
                 if (target && target->IsAlive())
                     me->AddThreat(target, 0.0f);
             }

src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp

@@ -665,7 +665,7 @@ void hyjalAI::DeSpawnVeins()
 {
     if (Faction == 1)
     {
-        Creature* unit=Unit::GetCreature((*me), instance->GetData64(DATA_JAINAPROUDMOORE));
+        Creature* unit=ObjectAccessor::GetCreature((*me), instance->GetData64(DATA_JAINAPROUDMOORE));
         if (!unit)return;
         hyjalAI* ai = CAST_AI(hyjalAI, unit->AI());
         if (!ai)return;
@@ -676,7 +676,7 @@ void hyjalAI::DeSpawnVeins()
         }
     } else if (Faction)
     {
-        Creature* unit=Unit::GetCreature((*me), instance->GetData64(DATA_THRALL));
+        Creature* unit=ObjectAccessor::GetCreature((*me), instance->GetData64(DATA_THRALL));
         if (!unit)return;
         hyjalAI* ai = CAST_AI(hyjalAI, unit->AI());
         if (!ai)return;
@@ -804,7 +804,7 @@ void hyjalAI::UpdateAI(uint32 diff)
         {
             if (BossGUID[i])
             {
-                Unit* unit = Unit::GetUnit(*me, BossGUID[i]);
+                Unit* unit = ObjectAccessor::GetUnit(*me, BossGUID[i]);
                 if (unit && (!unit->IsAlive()))
                 {
                     if (BossGUID[i] == BossGUID[0])
@@ -937,7 +937,7 @@ void hyjalAI::WaypointReached(uint32 waypointId)
             DoCast(me, SPELL_MASS_TELEPORT, false);
         if (me->GetEntry() == THRALL && DummyGuid)
         {
-            if (Creature* creature = Unit::GetCreature(*me, DummyGuid))
+            if (Creature* creature = ObjectAccessor::GetCreature(*me, DummyGuid))
             {
                 hyjalAI* ai = CAST_AI(hyjalAI, creature->AI());
                 ai->DoMassTeleport = true;

src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp

@@ -447,7 +447,7 @@ public:
             {
                 if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall
                 {
-                    Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
+                    Unit* target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_THRALL));
                     if (target && target->IsAlive())
                         me->AddThreat(target, 0.0f);
                 }
@@ -486,7 +486,7 @@ public:
                     CanMove = true;
                     if (instance->GetData(DATA_ALLIANCE_RETREAT) && !instance->GetData(DATA_HORDE_RETREAT))
                     {
-                        Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
+                        Unit* target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_THRALL));
                         if (target && target->IsAlive())
                             me->AddThreat(target, 0.0f);
                     } else if (instance->GetData(DATA_ALLIANCE_RETREAT) && instance->GetData(DATA_HORDE_RETREAT)){
@@ -563,13 +563,13 @@ public:
             {
                 if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall
                 {
-                    Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
+                    Unit* target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_THRALL));
                     if (target && target->IsAlive())
                         me->AddThreat(target, 0.0f);
                 }
                 else
                 {
-                    Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
+                    Unit* target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
                     if (target && target->IsAlive())
                         me->AddThreat(target, 0.0f);
                 }
@@ -662,13 +662,13 @@ public:
             {
                 if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall
                 {
-                    Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
+                    Unit* target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_THRALL));
                     if (target && target->IsAlive())
                         me->AddThreat(target, 0.0f);
                 }
                 else
                 {
-                    Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
+                    Unit* target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
                     if (target && target->IsAlive())
                         me->AddThreat(target, 0.0f);
                 }
@@ -773,13 +773,13 @@ public:
             {
                 if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall
                 {
-                    Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
+                    Unit* target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_THRALL));
                     if (target && target->IsAlive())
                         me->AddThreat(target, 0.0f);
                 }
                 else
                 {
-                    Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
+                    Unit* target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
                     if (target && target->IsAlive())
                         me->AddThreat(target, 0.0f);
                 }
@@ -886,13 +886,13 @@ public:
             {
                 if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall
                 {
-                    Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
+                    Unit* target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_THRALL));
                     if (target && target->IsAlive())
                         me->AddThreat(target, 0.0f);
                 }
                 else
                 {
-                    Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
+                    Unit* target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
                     if (target && target->IsAlive())
                         me->AddThreat(target, 0.0f);
                 }
@@ -982,13 +982,13 @@ public:
             {
                 if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall
                 {
-                    Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
+                    Unit* target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_THRALL));
                     if (target && target->IsAlive())
                         me->AddThreat(target, 0.0f);
                 }
                 else
                 {
-                    Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
+                    Unit* target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
                     if (target && target->IsAlive())
                         me->AddThreat(target, 0.0f);
                 }
@@ -1068,13 +1068,13 @@ public:
             {
                 if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall
                 {
-                    Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
+                    Unit* target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_THRALL));
                     if (target && target->IsAlive())
                         me->AddThreat(target, 0.0f);
                 }
                 else
                 {
-                    Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
+                    Unit* target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_JAINAPROUDMOORE));
                     if (target && target->IsAlive())
                         me->AddThreat(target, 0.0f);
                 }
@@ -1155,7 +1155,7 @@ public:
         {
             if (waypointId == 2 && !IsOverrun)
             {
-                Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
+                Unit* target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_THRALL));
                 if (target && target->IsAlive())
                 {
                     me->AddThreat(target, 0.0f);
@@ -1276,7 +1276,7 @@ public:
         {
             if (waypointId == 2 && !IsOverrun)
             {
-                Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
+                Unit* target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_THRALL));
                 if (target && target->IsAlive())
                 {
                     me->AddThreat(target, 0.0f);

src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp

@@ -627,7 +627,7 @@ public:
                             JumpToNextStep(2000);
                             break;
                         case 3:
-                            if (Creature* uther = Unit::GetCreature(*me, utherGUID))
+                            if (Creature* uther = ObjectAccessor::GetCreature(*me, utherGUID))
                             {
                                 uther->AI()->Talk(SAY_PHASE102);
                             }
@@ -642,13 +642,13 @@ public:
                             break;
                         //After waypoint 1
                         case 5:
-                            if (Creature* jaina = Unit::GetCreature(*me, jainaGUID))
+                            if (Creature* jaina = ObjectAccessor::GetCreature(*me, jainaGUID))
                                 jaina->SetTarget(me->GetGUID());
                             Talk(SAY_PHASE104);
                             JumpToNextStep(10000);
                             break;
                         case 6:
-                            if (Creature* uther = Unit::GetCreature(*me, utherGUID))
+                            if (Creature* uther = ObjectAccessor::GetCreature(*me, utherGUID))
                                 uther->AI()->Talk(SAY_PHASE105);
                             JumpToNextStep(1000);
                             break;
@@ -657,7 +657,7 @@ public:
                             JumpToNextStep(4000);
                             break;
                         case 8:
-                            if (Creature* uther = Unit::GetCreature(*me, utherGUID))
+                            if (Creature* uther = ObjectAccessor::GetCreature(*me, utherGUID))
                                  uther->AI()->Talk(SAY_PHASE107);
                             JumpToNextStep(6000);
                             break;
@@ -666,7 +666,7 @@ public:
                             JumpToNextStep(4000);
                             break;
                         case 10:
-                            if (Creature* uther = Unit::GetCreature(*me, utherGUID))
+                            if (Creature* uther = ObjectAccessor::GetCreature(*me, utherGUID))
                                  uther->AI()->Talk(SAY_PHASE109);
                             JumpToNextStep(8000);
                             break;
@@ -675,7 +675,7 @@ public:
                             JumpToNextStep(4000);
                             break;
                         case 12:
-                            if (Creature* uther = Unit::GetCreature(*me, utherGUID))
+                            if (Creature* uther = ObjectAccessor::GetCreature(*me, utherGUID))
                                  uther->AI()->Talk(SAY_PHASE111);
                             JumpToNextStep(4000);
                             break;
@@ -684,7 +684,7 @@ public:
                             JumpToNextStep(11000);
                             break;
                         case 14:
-                            if (Creature* jaina = Unit::GetCreature(*me, jainaGUID))
+                            if (Creature* jaina = ObjectAccessor::GetCreature(*me, jainaGUID))
                                  jaina->AI()->Talk(SAY_PHASE113);
                             JumpToNextStep(3000);
                             break;
@@ -693,12 +693,12 @@ public:
                             JumpToNextStep(9000);
                             break;
                         case 16:
-                            if (Creature* uther = Unit::GetCreature(*me, utherGUID))
+                            if (Creature* uther = ObjectAccessor::GetCreature(*me, utherGUID))
                                 uther->AI()->Talk(SAY_PHASE115);
                             JumpToNextStep(4000);
                             break;
                         case 17:
-                            if (Creature* uther = Unit::GetCreature(*me, utherGUID))
+                            if (Creature* uther = ObjectAccessor::GetCreature(*me, utherGUID))
                             {
                                 uther->SetWalk(true);
                                 uther->GetMotionMaster()->MovePoint(0, 1794.357f, 1272.183f, 140.558f);
@@ -706,7 +706,7 @@ public:
                             JumpToNextStep(1000);
                             break;
                         case 18:
-                            if (Creature* jaina = Unit::GetCreature(*me, jainaGUID))
+                            if (Creature* jaina = ObjectAccessor::GetCreature(*me, jainaGUID))
                             {
                                 me->SetTarget(jainaGUID);
                                 jaina->SetWalk(true);
@@ -719,7 +719,7 @@ public:
                             JumpToNextStep(1000);
                             break;
                         case 20:
-                            if (Creature* jaina = Unit::GetCreature(*me, jainaGUID))
+                            if (Creature* jaina = ObjectAccessor::GetCreature(*me, jainaGUID))
                                 jaina->AI()->Talk(SAY_PHASE117);
                             JumpToNextStep(3000);
                             break;
@@ -740,10 +740,10 @@ public:
                             bStepping = false;
                             SetRun(true);
 
-                            if (Creature* jaina = Unit::GetCreature(*me, jainaGUID))
+                            if (Creature* jaina = ObjectAccessor::GetCreature(*me, jainaGUID))
                                 jaina->DisappearAndDie();
 
-                            if (Creature* uther = Unit::GetCreature(*me, utherGUID))
+                            if (Creature* uther = ObjectAccessor::GetCreature(*me, utherGUID))
                                 uther->DisappearAndDie();
 
                             me->SetTarget(0);
@@ -772,7 +772,7 @@ public:
                         //After waypoint 9
                         case 27:
                             me->SetTarget(citymenGUID[0]);
-                            if (Creature* cityman = Unit::GetCreature(*me, citymenGUID[0]))
+                            if (Creature* cityman = ObjectAccessor::GetCreature(*me, citymenGUID[0]))
                             {
                                 cityman->SetTarget(me->GetGUID());
                                 cityman->SetWalk(true);
@@ -781,7 +781,7 @@ public:
                             JumpToNextStep(2000);
                             break;
                         case 28:
-                            if (Creature* cityman = Unit::GetCreature(*me, citymenGUID[0]))
+                            if (Creature* cityman = ObjectAccessor::GetCreature(*me, citymenGUID[0]))
                                 cityman->AI()->Talk(SAY_PHASE202);
                             JumpToNextStep(4000);
                             break;
@@ -799,11 +799,11 @@ public:
                         case 31:
                             SetEscortPaused(false);
                             bStepping = false;
-                            if (Creature* cityman1 = Unit::GetCreature(*me, citymenGUID[1]))
+                            if (Creature* cityman1 = ObjectAccessor::GetCreature(*me, citymenGUID[1]))
                             {
                                 cityman1->AI()->Talk(SAY_PHASE204);
                                 cityman1->SetTarget(me->GetGUID());
-                                if (Creature* cityman0 = Unit::GetCreature(*me, citymenGUID[0]))
+                                if (Creature* cityman0 = ObjectAccessor::GetCreature(*me, citymenGUID[0]))
                                     cityman0->Kill(cityman0);
                                 me->SetTarget(citymenGUID[1]);
                             }
@@ -815,7 +815,7 @@ public:
                             JumpToNextStep(1000);
                             break;
                         case 33:
-                            if (Creature* cityman1 = Unit::GetCreature(*me, citymenGUID[1]))
+                            if (Creature* cityman1 = ObjectAccessor::GetCreature(*me, citymenGUID[1]))
                                 cityman1->Kill(cityman1);
                             JumpToNextStep(1000);
                             break;
@@ -839,7 +839,7 @@ public:
                         case 36:
                             if (Creature* malganis = me->SummonCreature(NPC_MAL_GANIS, 2117.349f, 1288.624f, 136.271f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 60000))
                             {
-                                if (Creature* pStalkerM = Unit::GetCreature(*me, stalkerGUID))
+                                if (Creature* pStalkerM = ObjectAccessor::GetCreature(*me, stalkerGUID))
                                     malganis->CastSpell(pStalkerM, 63793, false);
 
                                 malganisGUID = malganis->GetGUID();
@@ -850,7 +850,7 @@ public:
                             JumpToNextStep(11000);
                             break;
                         case 37:
-                            if (Creature* malganis = Unit::GetCreature(*me, malganisGUID))
+                            if (Creature* malganis = ObjectAccessor::GetCreature(*me, malganisGUID))
                             {
                                 Creature* pZombie = GetClosestCreatureWithEntry(malganis, NPC_CITY_MAN, 100.0f);
                                 if (!pZombie)
@@ -865,12 +865,12 @@ public:
                             phaseTimer = 500;
                             break;
                         case 38:
-                            if (Creature* malganis = Unit::GetCreature(*me, malganisGUID))
+                            if (Creature* malganis = ObjectAccessor::GetCreature(*me, malganisGUID))
                                 malganis->AI()->Talk(SAY_PHASE207);
                             JumpToNextStep(17000);
                             break;
                         case 39:
-                            if (Creature* malganis = Unit::GetCreature(*me, malganisGUID))
+                            if (Creature* malganis = ObjectAccessor::GetCreature(*me, malganisGUID))
                                 malganis->SetVisible(false);
                             Talk(SAY_PHASE208);
                             JumpToNextStep(7000);
@@ -922,7 +922,7 @@ public:
                                     if (waveGUID[i] == 0)
                                         break;
                                     ++mobCounter;
-                                    Unit* temp = Unit::GetCreature(*me, waveGUID[i]);
+                                    Unit* temp = ObjectAccessor::GetCreature(*me, waveGUID[i]);
                                     if (!temp || temp->isDead())
                                         ++deadCounter;
                                 }
@@ -976,16 +976,16 @@ public:
                         //After Gossip 2 (waypoint 22)
                         case 61:
                             me->SetReactState(REACT_AGGRESSIVE);
-                            if (Creature* disguised0 = Unit::GetCreature(*me, infiniteDraconianGUID[0]))
+                            if (Creature* disguised0 = ObjectAccessor::GetCreature(*me, infiniteDraconianGUID[0]))
                                 disguised0->SetTarget(me->GetGUID());
-                            if (Creature* disguised1 = Unit::GetCreature(*me, infiniteDraconianGUID[1]))
+                            if (Creature* disguised1 = ObjectAccessor::GetCreature(*me, infiniteDraconianGUID[1]))
                                 disguised1->SetTarget(me->GetGUID());
-                            if (Creature* disguised2 = Unit::GetCreature(*me, infiniteDraconianGUID[2]))
+                            if (Creature* disguised2 = ObjectAccessor::GetCreature(*me, infiniteDraconianGUID[2]))
                                 disguised2->SetTarget(me->GetGUID());
                             JumpToNextStep(1000);
                             break;
                         case 62:
-                            if (Creature* disguised0 = Unit::GetCreature(*me, infiniteDraconianGUID[0]))
+                            if (Creature* disguised0 = ObjectAccessor::GetCreature(*me, infiniteDraconianGUID[0]))
                                 disguised0->AI()->Talk(SAY_PHASE302);
                             JumpToNextStep(7000);
                             break;
@@ -1001,7 +1001,7 @@ public:
                             JumpToNextStep(1000);
                             break;
                         case 65:
-                            if (Creature* disguised0 = Unit::GetCreature(*me, infiniteDraconianGUID[0]))
+                            if (Creature* disguised0 = ObjectAccessor::GetCreature(*me, infiniteDraconianGUID[0]))
                                 disguised0->HandleEmoteCommand(11);
                             JumpToNextStep(1000);
                             break;
@@ -1010,12 +1010,12 @@ public:
                             JumpToNextStep(2000);
                             break;
                         case 67:
-                            if (Creature* disguised0 = Unit::GetCreature(*me, infiniteDraconianGUID[0]))
+                            if (Creature* disguised0 = ObjectAccessor::GetCreature(*me, infiniteDraconianGUID[0]))
                                 disguised0->AI()->Talk(SAY_PHASE305);
                             JumpToNextStep(1000);
                             break;
                         case 68:
-                            if (Creature* disguised2 = Unit::GetCreature(*me, infiniteDraconianGUID[2]))
+                            if (Creature* disguised2 = ObjectAccessor::GetCreature(*me, infiniteDraconianGUID[2]))
                             {
                                 disguised2->UpdateEntry(NPC_INFINITE_HUNTER);
                                 //Make them unattackable
@@ -1025,7 +1025,7 @@ public:
                             JumpToNextStep(2000);
                             break;
                         case 69:
-                            if (Creature* disguised1 = Unit::GetCreature(*me, infiniteDraconianGUID[1]))
+                            if (Creature* disguised1 = ObjectAccessor::GetCreature(*me, infiniteDraconianGUID[1]))
                             {
                                 disguised1->UpdateEntry(NPC_INFINITE_AGENT);
                                 //Make them unattackable
@@ -1035,7 +1035,7 @@ public:
                             JumpToNextStep(2000);
                             break;
                         case 70:
-                            if (Creature* disguised0 = Unit::GetCreature(*me, infiniteDraconianGUID[0]))
+                            if (Creature* disguised0 = ObjectAccessor::GetCreature(*me, infiniteDraconianGUID[0]))
                             {
                                 disguised0->UpdateEntry(NPC_INFINITE_ADVERSARY);
                                 //Make them unattackable
@@ -1051,7 +1051,7 @@ public:
                         case 77:
                             //Make cratures attackable
                             for (uint32 i = 0; i< ENCOUNTER_DRACONIAN_NUMBER; ++i)
-                                if (Creature* temp = Unit::GetCreature(*me, infiniteDraconianGUID[i]))
+                                if (Creature* temp = ObjectAccessor::GetCreature(*me, infiniteDraconianGUID[i]))
                                 {
                                     temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
                                     temp->SetReactState(REACT_AGGRESSIVE);
@@ -1091,7 +1091,7 @@ public:
                             if (instance->GetData(DATA_EPOCH_EVENT) != DONE)
                             {
                                 SpawnTimeRift(17, &epochGUID);
-                                if (Creature* epoch = Unit::GetCreature(*me, epochGUID))
+                                if (Creature* epoch = ObjectAccessor::GetCreature(*me, epochGUID))
                                     epoch->AI()->Talk(SAY_PHASE314);
                                 me->SetTarget(epochGUID);
                             }
@@ -1105,7 +1105,7 @@ public:
                         case 82:
                             if (instance->GetData(DATA_EPOCH_EVENT) != DONE)
                             {
-                                if (Creature* epoch = Unit::GetCreature(*me, epochGUID))
+                                if (Creature* epoch = ObjectAccessor::GetCreature(*me, epochGUID))
                                 {
                                     //Make Epoch attackable
                                     epoch->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
@@ -1157,7 +1157,7 @@ public:
                             me->SetTarget(malganisGUID);
                             break;
                         case 87:
-                            if (Creature* malganis = Unit::GetCreature(*me, malganisGUID))
+                            if (Creature* malganis = ObjectAccessor::GetCreature(*me, malganisGUID))
                             {
                                 malganis->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_UNK_6 | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_UNK_15);
                                 malganis->SetReactState(REACT_AGGRESSIVE);

src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp

@@ -402,7 +402,7 @@ public:
                 case 94:
                     if (uint64 TarethaGUID = instance->GetData64(DATA_TARETHA))
                     {
-                        if (Creature* Taretha = Creature::GetCreature(*me, TarethaGUID))
+                        if (Creature* Taretha = ObjectAccessor::GetCreature(*me, TarethaGUID))
                             Taretha->AI()->Talk(SAY_TA_ESCAPED, me);
                     }
                     break;
@@ -590,7 +590,7 @@ public:
                 if (instance->GetData64(DATA_EPOCH) == 0)
                      creature->SummonCreature(ENTRY_EPOCH, 2639.13f, 698.55f, 65.43f, 4.59f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000);
 
-                if (Creature* thrall = (Unit::GetCreature(*creature, instance->GetData64(DATA_THRALL))))
+                if (Creature* thrall = (ObjectAccessor::GetCreature(*creature, instance->GetData64(DATA_THRALL))))
                     CAST_AI(npc_thrall_old_hillsbrad::npc_thrall_old_hillsbradAI, thrall->AI())->StartWP();
             }
         }

src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp

@@ -545,7 +545,7 @@ public:
             while (i != Stomach_Map.end())
             {
                 //Check for valid player
-                Unit* unit = Unit::GetUnit(*me, i->first);
+                Unit* unit = ObjectAccessor::GetUnit(*me, i->first);
 
                 //Only units out of stomach
                 if (unit && i->second == false)
@@ -640,7 +640,7 @@ public:
                         me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE);
 
                         //Emerging phase
-                        //AttackStart(Unit::GetUnit(*me, HoldpPlayer));
+                        //AttackStart(ObjectAccessor::GetUnit(*me, HoldpPlayer));
                         DoZoneInCombat();
 
                         //Place all units in threat list on outside of stomach
@@ -686,7 +686,7 @@ public:
                         while (i != Stomach_Map.end())
                         {
                             //Check for valid player
-                            Unit* unit = Unit::GetUnit(*me, i->first);
+                            Unit* unit = ObjectAccessor::GetUnit(*me, i->first);
 
                             //Only move units in stomach
                             if (unit && i->second == true)
@@ -717,7 +717,7 @@ public:
                         while (i != Stomach_Map.end())
                         {
                             //Check for valid player
-                            Unit* unit = Unit::GetUnit(*me, i->first);
+                            Unit* unit = ObjectAccessor::GetUnit(*me, i->first);
 
                             //Only apply to units in stomach
                             if (unit && i->second == true)
@@ -767,7 +767,7 @@ public:
                         if (StomachEnterVisTimer <= diff)
                         {
                             //Check for valid player
-                            Unit* unit = Unit::GetUnit(*me, StomachEnterTarget);
+                            Unit* unit = ObjectAccessor::GetUnit(*me, StomachEnterTarget);
 
                             if (unit)
                             {
@@ -917,7 +917,7 @@ public:
 
         void JustDied(Unit* /*killer*/) override
         {
-            if (Unit* p = Unit::GetUnit(*me, Portal))
+            if (Unit* p = ObjectAccessor::GetUnit(*me, Portal))
                 p->Kill(p);
         }
 
@@ -998,7 +998,7 @@ public:
 
         void JustDied(Unit* /*killer*/) override
         {
-            if (Unit* p = Unit::GetUnit(*me, Portal))
+            if (Unit* p = ObjectAccessor::GetUnit(*me, Portal))
                 p->Kill(p);
         }
 
@@ -1026,7 +1026,7 @@ public:
             {
                 if (EvadeTimer <= diff)
                 {
-                    if (Unit* p = Unit::GetUnit(*me, Portal))
+                    if (Unit* p = ObjectAccessor::GetUnit(*me, Portal))
                         p->Kill(p);
 
                     //Dissapear and reappear at new position
@@ -1115,7 +1115,7 @@ public:
 
         void JustDied(Unit* /*killer*/) override
         {
-            if (Unit* p = Unit::GetUnit(*me, Portal))
+            if (Unit* p = ObjectAccessor::GetUnit(*me, Portal))
                 p->Kill(p);
         }
 
@@ -1144,7 +1144,7 @@ public:
             {
                 if (EvadeTimer <= diff)
                 {
-                    if (Unit* p = Unit::GetUnit(*me, Portal))
+                    if (Unit* p = ObjectAccessor::GetUnit(*me, Portal))
                         p->Kill(p);
 
                     //Dissapear and reappear at new position
@@ -1234,7 +1234,7 @@ public:
 
         void JustDied(Unit* /*killer*/) override
         {
-            if (Unit* p = Unit::GetUnit(*me, Portal))
+            if (Unit* p = ObjectAccessor::GetUnit(*me, Portal))
                 p->Kill(p);
         }
 

src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp

@@ -103,7 +103,7 @@ struct boss_twinemperorsAI : public ScriptedAI
 
     Creature* GetOtherBoss()
     {
-        return Unit::GetCreature(*me, instance->GetData64(IAmVeklor() ? DATA_VEKNILASH : DATA_VEKLOR));
+        return ObjectAccessor::GetCreature(*me, instance->GetData64(IAmVeklor() ? DATA_VEKNILASH : DATA_VEKLOR));
     }
 
     void DamageTaken(Unit* /*done_by*/, uint32 &damage) override

src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp

@@ -132,7 +132,7 @@ public:
         void SendMyListToBuddies()
         {
             for (int i=0; i<3; ++i)
-                if (Creature* pNearby = Unit::GetCreature(*me, NearbyGUID[i]))
+                if (Creature* pNearby = ObjectAccessor::GetCreature(*me, NearbyGUID[i]))
                     GiveBuddyMyList(pNearby);
         }
 
@@ -140,7 +140,7 @@ public:
         {
             for (int i=0; i<3; ++i)
             {
-                Creature* c = Unit::GetCreature(*me, NearbyGUID[i]);
+                Creature* c = ObjectAccessor::GetCreature(*me, NearbyGUID[i]);
                 if (c)
                 {
                     if (!c->IsInCombat())
@@ -195,7 +195,7 @@ public:
                 if (!NearbyGUID[bli])
                     break;
 
-                Creature* pNearby = Unit::GetCreature(*me, NearbyGUID[bli]);
+                Creature* pNearby = ObjectAccessor::GetCreature(*me, NearbyGUID[bli]);
                 if (!pNearby)
                     break;
 
@@ -221,7 +221,7 @@ public:
                 {
                     if (!NearbyGUID[i])
                         continue;
-                    if (Creature* pNearby = Unit::GetCreature(*me, NearbyGUID[i]))
+                    if (Creature* pNearby = ObjectAccessor::GetCreature(*me, NearbyGUID[i]))
                     {
                         if (pNearby->isDead())
                             pNearby->Respawn();
@@ -250,7 +250,7 @@ public:
         {
             for (int ni=0; ni<3; ++ni)
             {
-                Creature* sent = Unit::GetCreature(*me, NearbyGUID[ni]);
+                Creature* sent = ObjectAccessor::GetCreature(*me, NearbyGUID[ni]);
                 if (!sent)
                     continue;
                 if (sent->isDead())

src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp

@@ -443,7 +443,7 @@ public:
 
         uint32 NextStep(uint8 Step)
         {
-            Creature* Spark = Unit::GetCreature(*me, SparkGUID);
+            Creature* Spark = ObjectAccessor::GetCreature(*me, SparkGUID);
             if (!Spark)
                 return 99999999;
 

src/server/scripts/Kalimdor/zone_silithus.cpp

@@ -706,7 +706,7 @@ public:
                         break;
                     case 65:
                         me->SetVisible(false);
-                        if (Creature* AnachronosQuestTrigger = (Unit::GetCreature(*me, AnachronosQuestTriggerGUID)))
+                        if (Creature* AnachronosQuestTrigger = (ObjectAccessor::GetCreature(*me, AnachronosQuestTriggerGUID)))
                         {
                             Talk(ARYGOS_YELL_1);
                             AnachronosQuestTrigger->AI()->EnterEvadeMode();
@@ -1002,7 +1002,7 @@ void npc_qiraj_war_spawn::npc_qiraj_war_spawnAI::JustDied(Unit* /*slayer*/)
     if (!MobGUID)
         return;
 
-    if (Creature* mob = Unit::GetCreature(*me, MobGUID))
+    if (Creature* mob = ObjectAccessor::GetCreature(*me, MobGUID))
         if (npc_anachronos_quest_trigger::npc_anachronos_quest_triggerAI* triggerAI = CAST_AI(npc_anachronos_quest_trigger::npc_anachronos_quest_triggerAI, mob->AI()))
             triggerAI->LiveCounter();
 

src/server/scripts/Kalimdor/zone_tanaris.cpp

@@ -584,7 +584,7 @@ public:
                     {
                         PostEventTimer = 5000;
 
-                        Creature* torta = Creature::GetCreature(*me, TortaGUID);
+                        Creature* torta = ObjectAccessor::GetCreature(*me, TortaGUID);
                         if (!torta || !torta->IsAlive())
                         {
                             //something happened, so just complete

src/server/scripts/Kalimdor/zone_the_barrens.cpp

@@ -380,7 +380,7 @@ public:
                     {
                         if (AffrayChallenger[i])
                         {
-                            Creature* creature = Unit::GetCreature((*me), AffrayChallenger[i]);
+                            Creature* creature = ObjectAccessor::GetCreature((*me), AffrayChallenger[i]);
                             if (creature && creature->IsAlive())
                                 creature->DisappearAndDie();
                         }
@@ -388,7 +388,7 @@ public:
 
                     if (BigWill) // unsummon bigWill
                     {
-                        Creature* creature = Unit::GetCreature((*me), BigWill);
+                        Creature* creature = ObjectAccessor::GetCreature((*me), BigWill);
                         if (creature && creature->IsAlive())
                             creature->DisappearAndDie();
                     }
@@ -429,7 +429,7 @@ public:
                         {
                             if (AffrayChallenger[i])
                             {
-                                Creature* creature = Unit::GetCreature((*me), AffrayChallenger[i]);
+                                Creature* creature = ObjectAccessor::GetCreature((*me), AffrayChallenger[i]);
                                 if ((!creature || (!creature->IsAlive())) && !ChallengerDown[i])
                                 {
                                     Talk(SAY_TWIGGY_FLATHEAD_DOWN);

src/server/scripts/Kalimdor/zone_ungoro_crater.cpp

@@ -270,7 +270,7 @@ public:
                 {
                     if (EndEventTimer <= Diff)
                     {
-                        Creature* spraggle = Creature::GetCreature(*me, SpraggleGUID);
+                        Creature* spraggle = ObjectAccessor::GetCreature(*me, SpraggleGUID);
                         if (!spraggle || !spraggle->IsAlive())
                         {
                             SetFollowComplete();

src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp

@@ -211,7 +211,7 @@ public:
             // Check if all summons in this phase killed
             for (SummonList::const_iterator iter = Summons.begin(); iter != Summons.end(); ++iter)
             {
-                if (Creature* visage = Unit::GetCreature(*me, *iter))
+                if (Creature* visage = ObjectAccessor::GetCreature(*me, *iter))
                 {
                     // Not all are dead
                     if (phase == visage->GetPhaseMask())

src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp

@@ -212,7 +212,7 @@ public:
             }
             else
             {
-                if (Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_PL_JEDOGA_TARGET)))
+                if (Unit* target = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_PL_JEDOGA_TARGET)))
                 {
                     AttackStart(target);
                     instance->SetData(DATA_JEDOGA_RESET_INITIANDS, 0);

src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp

@@ -188,7 +188,7 @@ public:
                         }
                         break;
                     case IMPALE_PHASE_ATTACK:
-                        if (Creature* impaleTarget = Unit::GetCreature(*me, ImpaleTarget))
+                        if (Creature* impaleTarget = ObjectAccessor::GetCreature(*me, ImpaleTarget))
                         {
                             impaleTarget->CastSpell(impaleTarget, SPELL_IMPALE_SPIKE, false);
                             impaleTarget->RemoveAurasDueToSpell(SPELL_IMPALE_SHAKEGROUND);
@@ -197,7 +197,7 @@ public:
                         ImpaleTimer = 1*IN_MILLISECONDS;
                         break;
                     case IMPALE_PHASE_DMG:
-                        if (Creature* impaleTarget = Unit::GetCreature(*me, ImpaleTarget))
+                        if (Creature* impaleTarget = ObjectAccessor::GetCreature(*me, ImpaleTarget))
                             me->CastSpell(impaleTarget, SPELL_IMPALE_DMG, true);
                         ImpalePhase = IMPALE_PHASE_TARGET;
                         ImpaleTimer = 9*IN_MILLISECONDS;

src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp

@@ -178,15 +178,15 @@ public:
             Talk(SAY_SARTHARION_DEATH);
             _JustDied();
 
-            if (Creature* tenebron = Unit::GetCreature(*me, instance->GetData64(DATA_TENEBRON)))
+            if (Creature* tenebron = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_TENEBRON)))
                 if (tenebron->IsAlive())
                     tenebron->DisappearAndDie();
 
-            if (Creature* shadron = Unit::GetCreature(*me, instance->GetData64(DATA_SHADRON)))
+            if (Creature* shadron = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_SHADRON)))
                 if (shadron->IsAlive())
                     shadron->DisappearAndDie();
 
-            if (Creature* vesperon = Unit::GetCreature(*me, instance->GetData64(DATA_VESPERON)))
+            if (Creature* vesperon = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_VESPERON)))
                 if (vesperon->IsAlive())
                     vesperon->DisappearAndDie();
         }
@@ -211,7 +211,7 @@ public:
 
         void DrakeRespawn() // Drakes respawning system
         {
-            if (Creature* tenebron = Unit::GetCreature(*me, instance->GetData64(DATA_TENEBRON)))
+            if (Creature* tenebron = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_TENEBRON)))
             {
                 tenebron->SetHomePosition(3239.07f, 657.235f, 86.8775f, 4.74729f);
                 if (tenebron->IsAlive())
@@ -231,7 +231,7 @@ public:
                 }
             }
 
-            if (Creature* shadron = Unit::GetCreature(*me, instance->GetData64(DATA_SHADRON)))
+            if (Creature* shadron = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_SHADRON)))
             {
                 shadron->SetHomePosition(3363.06f, 525.28f, 98.362f, 4.76475f);
                 if (shadron->IsAlive())
@@ -251,7 +251,7 @@ public:
                 }
             }
 
-            if (Creature* vesperon = Unit::GetCreature(*me, instance->GetData64(DATA_VESPERON)))
+            if (Creature* vesperon = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_VESPERON)))
             {
                 vesperon->SetHomePosition(3145.68f, 520.71f, 89.7f, 4.64258f);
                 if (vesperon->IsAlive())
@@ -280,7 +280,7 @@ public:
             //if at least one of the dragons are alive and are being called
             bool _canUseWill = false;
 
-            if (Creature* fetchTene = Unit::GetCreature(*me, instance->GetData64(DATA_TENEBRON)))
+            if (Creature* fetchTene = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_TENEBRON)))
             {
                 if (fetchTene->IsAlive() && !fetchTene->GetVictim())
                 {
@@ -298,7 +298,7 @@ public:
                 }
             }
 
-            if (Creature* fetchShad = Unit::GetCreature(*me, instance->GetData64(DATA_SHADRON)))
+            if (Creature* fetchShad = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_SHADRON)))
             {
                 if (fetchShad->IsAlive() && !fetchShad->GetVictim())
                 {
@@ -316,7 +316,7 @@ public:
                 }
             }
 
-            if (Creature* fetchVesp = Unit::GetCreature(*me, instance->GetData64(DATA_VESPERON)))
+            if (Creature* fetchVesp = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_VESPERON)))
             {
                 if (fetchVesp && fetchVesp->IsAlive() && !fetchVesp->GetVictim())
                 {
@@ -340,7 +340,7 @@ public:
 
         void CallDragon(uint32 dataId)
         {
-            if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(dataId)))
+            if (Creature* temp = ObjectAccessor::GetCreature(*me, instance->GetData64(dataId)))
             {
                 if (temp->IsAlive() && !temp->GetVictim())
                 {

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp

@@ -292,7 +292,7 @@ public:
             bHealth = false;
             bDone = false;
 
-            if (Creature* pMemory = Unit::GetCreature(*me, MemoryGUID))
+            if (Creature* pMemory = ObjectAccessor::GetCreature(*me, MemoryGUID))
                 if (pMemory->IsAlive())
                     pMemory->RemoveFromWorld();
         }
@@ -373,7 +373,7 @@ public:
                             DoCast(me, SPELL_RENEW);
                             break;
                         case 1:
-                            if (Creature* pMemory = Unit::GetCreature(*me, MemoryGUID))
+                            if (Creature* pMemory = ObjectAccessor::GetCreature(*me, MemoryGUID))
                                 if (pMemory->IsAlive())
                                     DoCast(pMemory, SPELL_RENEW);
                             break;

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp

@@ -140,7 +140,7 @@ public:
 
             for (std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr)
             {
-                if (Creature* temp = Unit::GetCreature(*me, *itr))
+                if (Creature* temp = ObjectAccessor::GetCreature(*me, *itr))
                     if (temp)
                         temp->DisappearAndDie();
             }

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp

@@ -126,9 +126,9 @@ bool GrandChampionsOutVehicle(Creature* me)
     if (!instance)
         return false;
 
-    Creature* pGrandChampion1 = Unit::GetCreature(*me, instance->GetData64(DATA_GRAND_CHAMPION_1));
-    Creature* pGrandChampion2 = Unit::GetCreature(*me, instance->GetData64(DATA_GRAND_CHAMPION_2));
-    Creature* pGrandChampion3 = Unit::GetCreature(*me, instance->GetData64(DATA_GRAND_CHAMPION_3));
+    Creature* pGrandChampion1 = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_GRAND_CHAMPION_1));
+    Creature* pGrandChampion2 = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_GRAND_CHAMPION_2));
+    Creature* pGrandChampion3 = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_GRAND_CHAMPION_3));
 
     if (pGrandChampion1 && pGrandChampion2 && pGrandChampion3)
     {
@@ -829,7 +829,7 @@ public:
             if (bShoot && uiMultiShotTimer <= uiDiff)
             {
                 me->InterruptNonMeleeSpells(true);
-                Unit* target = Unit::GetUnit(*me, uiTargetGUID);
+                Unit* target = ObjectAccessor::GetUnit(*me, uiTargetGUID);
 
                 if (target && me->IsInRange(target, 5.0f, 30.0f, false))
                 {

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp

@@ -161,7 +161,7 @@ public:
                         }
 
                         for (std::list<uint64>::const_iterator itr = TempList.begin(); itr != TempList.end(); ++itr)
-                            if (Creature* summon = Unit::GetCreature(*me, *itr))
+                            if (Creature* summon = ObjectAccessor::GetCreature(*me, *itr))
                                 AggroAllPlayers(summon);
                     }else if (uiLesserChampions == 9)
                         StartGrandChampionsAttack();
@@ -173,9 +173,9 @@ public:
 
         void StartGrandChampionsAttack()
         {
-            Creature* pGrandChampion1 = Unit::GetCreature(*me, uiVehicle1GUID);
-            Creature* pGrandChampion2 = Unit::GetCreature(*me, uiVehicle2GUID);
-            Creature* pGrandChampion3 = Unit::GetCreature(*me, uiVehicle3GUID);
+            Creature* pGrandChampion1 = ObjectAccessor::GetCreature(*me, uiVehicle1GUID);
+            Creature* pGrandChampion2 = ObjectAccessor::GetCreature(*me, uiVehicle2GUID);
+            Creature* pGrandChampion3 = ObjectAccessor::GetCreature(*me, uiVehicle3GUID);
 
             if (pGrandChampion1 && pGrandChampion2 && pGrandChampion3)
             {
@@ -417,7 +417,7 @@ public:
                         if (!Champion1List.empty())
                         {
                             for (std::list<uint64>::const_iterator itr = Champion1List.begin(); itr != Champion1List.end(); ++itr)
-                                if (Creature* summon = Unit::GetCreature(*me, *itr))
+                                if (Creature* summon = ObjectAccessor::GetCreature(*me, *itr))
                                     AggroAllPlayers(summon);
                             NextStep(0, false);
                         }

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp

@@ -344,7 +344,7 @@ class boss_anubarak_trial : public CreatureScript
                             uint32 at = urand(0, _burrowGUID.size()-1);
                             for (uint32 k = 0; k < at; k++)
                                 ++i;
-                            if (Creature* pBurrow = Unit::GetCreature(*me, *i))
+                            if (Creature* pBurrow = ObjectAccessor::GetCreature(*me, *i))
                                 pBurrow->CastSpell(pBurrow, 66340, false);
 
                             events.ScheduleEvent(EVENT_SUMMON_SCARAB, 4*IN_MILLISECONDS, 0, PHASE_SUBMERGED);
@@ -377,7 +377,7 @@ class boss_anubarak_trial : public CreatureScript
                             uint8 i = startAt;
                             do
                             {
-                                if (Unit* pSphere = Unit::GetCreature(*me, _sphereGUID[i]))
+                                if (Unit* pSphere = ObjectAccessor::GetCreature(*me, _sphereGUID[i]))
                                 {
                                     if (!pSphere->HasAura(SPELL_FROST_SPHERE))
                                     {

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp

@@ -479,7 +479,7 @@ class boss_toc_champion_controller : public CreatureScript
                     case 1:
                         for (std::list<uint64>::iterator i = _summons.begin(); i != _summons.end(); ++i)
                         {
-                            if (Creature* temp = Unit::GetCreature(*me, *i))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, *i))
                             {
                                 temp->SetReactState(REACT_AGGRESSIVE);
                                 temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_IMMUNE_TO_PC);
@@ -559,7 +559,7 @@ struct boss_faction_championsAI : public BossAI
 
     void JustReachedHome() override
     {
-        if (Creature* pChampionController = Unit::GetCreature((*me), instance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
+        if (Creature* pChampionController = ObjectAccessor::GetCreature((*me), instance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
             pChampionController->AI()->SetData(2, FAIL);
         me->DespawnOrUnsummon();
     }
@@ -577,7 +577,7 @@ struct boss_faction_championsAI : public BossAI
         std::list<HostileReference*> const& tList = me->getThreatManager().getThreatList();
         for (std::list<HostileReference*>::const_iterator itr = tList.begin(); itr != tList.end(); ++itr)
         {
-            Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid());
+            Unit* unit = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid());
             if (unit && me->getThreatManager().getThreat(unit))
             {
                 if (unit->GetTypeId() == TYPEID_PLAYER)
@@ -609,7 +609,7 @@ struct boss_faction_championsAI : public BossAI
     void JustDied(Unit* /*killer*/) override
     {
         if (_aiType != AI_PET)
-            if (Creature* pChampionController = Unit::GetCreature((*me), instance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
+            if (Creature* pChampionController = ObjectAccessor::GetCreature((*me), instance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
                 pChampionController->AI()->SetData(2, DONE);
     }
 
@@ -617,7 +617,7 @@ struct boss_faction_championsAI : public BossAI
     {
         DoCast(me, SPELL_ANTI_AOE, true);
         _EnterCombat();
-        if (Creature* pChampionController = Unit::GetCreature((*me), instance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
+        if (Creature* pChampionController = ObjectAccessor::GetCreature((*me), instance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
             pChampionController->AI()->SetData(2, IN_PROGRESS);
     }
 
@@ -634,11 +634,11 @@ struct boss_faction_championsAI : public BossAI
 
             if (TeamInInstance == ALLIANCE)
             {
-                if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(NPC_VARIAN)))
+                if (Creature* temp = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_VARIAN)))
                     temp->AI()->Talk(SAY_KILL_PLAYER);
             }
             else
-                if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(NPC_GARROSH)))
+                if (Creature* temp = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_GARROSH)))
                     temp->AI()->Talk(SAY_KILL_PLAYER);
 
 
@@ -663,7 +663,7 @@ struct boss_faction_championsAI : public BossAI
         Unit* target;
         for (iter = tList.begin(); iter!=tList.end(); ++iter)
         {
-            target = Unit::GetUnit(*me, (*iter)->getUnitGuid());
+            target = ObjectAccessor::GetUnit(*me, (*iter)->getUnitGuid());
             if (target && target->getPowerType() == POWER_MANA)
                 return target;
         }
@@ -678,7 +678,7 @@ struct boss_faction_championsAI : public BossAI
         Unit* target;
         for (iter = tList.begin(); iter != tList.end(); ++iter)
         {
-            target = Unit::GetUnit(*me, (*iter)->getUnitGuid());
+            target = ObjectAccessor::GetUnit(*me, (*iter)->getUnitGuid());
                 if (target && me->GetDistance2d(target) < distance)
                     ++count;
         }

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp

@@ -508,7 +508,7 @@ struct boss_jormungarAI : public BossAI
 
     void JustDied(Unit* /*killer*/) override
     {
-        if (Creature* otherWorm = Unit::GetCreature(*me, instance->GetData64(OtherWormEntry)))
+        if (Creature* otherWorm = ObjectAccessor::GetCreature(*me, instance->GetData64(OtherWormEntry)))
         {
             if (!otherWorm->IsAlive())
             {

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp

@@ -245,7 +245,7 @@ struct boss_twin_baseAI : public BossAI
     // Called when sister pointer needed
     Creature* GetSister()
     {
-        return Unit::GetCreature((*me), instance->GetData64(SisterNpcId));
+        return ObjectAccessor::GetCreature((*me), instance->GetData64(SisterNpcId));
     }
 
     void EnterCombat(Unit* /*who*/) override

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp

@@ -95,7 +95,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript
                 // make sure Anub'arak isnt missing and floor is destroyed after a crash
                 if (GetBossState(BOSS_LICH_KING) == DONE && TrialCounter && GetBossState(BOSS_ANUBARAK) != DONE)
                 {
-                    Creature* anubArak = Unit::GetCreature(*player, GetData64(NPC_ANUBARAK));
+                    Creature* anubArak = ObjectAccessor::GetCreature(*player, GetData64(NPC_ANUBARAK));
                     if (!anubArak)
                         anubArak = player->SummonCreature(NPC_ANUBARAK, AnubarakLoc[0].GetPositionX(), AnubarakLoc[0].GetPositionY(), AnubarakLoc[0].GetPositionZ(), 3, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME);
 

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp

@@ -173,7 +173,7 @@ class npc_announcer_toc10 : public CreatureScript
             else if (instance->GetBossState(BOSS_JARAXXUS) != DONE)
             {
                 // if Jaraxxus is spawned, but the raid wiped
-                if (Creature* jaraxxus = Unit::GetCreature(*player, instance->GetData64(NPC_JARAXXUS)))
+                if (Creature* jaraxxus = ObjectAccessor::GetCreature(*player, instance->GetData64(NPC_JARAXXUS)))
                 {
                     jaraxxus->RemoveAurasDueToSpell(SPELL_JARAXXUS_CHAINS);
                     jaraxxus->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -207,7 +207,7 @@ class npc_announcer_toc10 : public CreatureScript
                 creature->CastSpell(creature, SPELL_CORPSE_TELEPORT, false);
                 creature->CastSpell(creature, SPELL_DESTROY_FLOOR_KNOCKUP, false);
 
-                Creature* anubArak = Unit::GetCreature(*creature, instance->GetData64(NPC_ANUBARAK));
+                Creature* anubArak = ObjectAccessor::GetCreature(*creature, instance->GetData64(NPC_ANUBARAK));
                 if (!anubArak || !anubArak->IsAlive())
                     anubArak = creature->SummonCreature(NPC_ANUBARAK, AnubarakLoc[0].GetPositionX(), AnubarakLoc[0].GetPositionY(), AnubarakLoc[0].GetPositionZ(), 3, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME);
 
@@ -330,7 +330,7 @@ class boss_lich_king_toc : public CreatureScript
                             me->CastSpell(me, SPELL_DESTROY_FLOOR_KNOCKUP, false);
 
                             _instance->SetBossState(BOSS_LICH_KING, DONE);
-                            Creature* temp = Unit::GetCreature(*me, _instance->GetData64(NPC_ANUBARAK));
+                            Creature* temp = ObjectAccessor::GetCreature(*me, _instance->GetData64(NPC_ANUBARAK));
                             if (!temp || !temp->IsAlive())
                                 temp = me->SummonCreature(NPC_ANUBARAK, AnubarakLoc[0].GetPositionX(), AnubarakLoc[0].GetPositionY(), AnubarakLoc[0].GetPositionZ(), 3, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME);
 
@@ -377,7 +377,7 @@ class npc_fizzlebang_toc : public CreatureScript
             {
                 Talk(SAY_STAGE_1_06, killer);
                 _instance->SetData(TYPE_EVENT, 1180);
-                if (Creature* temp = Unit::GetCreature(*me, _instance->GetData64(NPC_JARAXXUS)))
+                if (Creature* temp = ObjectAccessor::GetCreature(*me, _instance->GetData64(NPC_JARAXXUS)))
                 {
                     temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                     temp->SetReactState(REACT_AGGRESSIVE);
@@ -484,23 +484,23 @@ class npc_fizzlebang_toc : public CreatureScript
                             _updateTimer = 5*IN_MILLISECONDS;
                             break;
                         case 1142:
-                            if (Creature* temp = Unit::GetCreature(*me, _instance->GetData64(NPC_JARAXXUS)))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, _instance->GetData64(NPC_JARAXXUS)))
                                 temp->SetTarget(me->GetGUID());
-                            if (Creature* pTrigger = Unit::GetCreature(*me, _triggerGUID))
+                            if (Creature* pTrigger = ObjectAccessor::GetCreature(*me, _triggerGUID))
                                 pTrigger->DespawnOrUnsummon();
-                            if (Creature* pPortal = Unit::GetCreature(*me, _portalGUID))
+                            if (Creature* pPortal = ObjectAccessor::GetCreature(*me, _portalGUID))
                                 pPortal->DespawnOrUnsummon();
                             _instance->SetData(TYPE_EVENT, 1144);
                             _updateTimer = 10*IN_MILLISECONDS;
                             break;
                         case 1144:
-                            if (Creature* temp = Unit::GetCreature(*me, _instance->GetData64(NPC_JARAXXUS)))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, _instance->GetData64(NPC_JARAXXUS)))
                                 temp->AI()->Talk(SAY_STAGE_1_05);
                             _instance->SetData(TYPE_EVENT, 1150);
                             _updateTimer = 5*IN_MILLISECONDS;
                             break;
                         case 1150:
-                            if (Creature* temp = Unit::GetCreature(*me, _instance->GetData64(NPC_JARAXXUS)))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, _instance->GetData64(NPC_JARAXXUS)))
                             {
                                 //1-shot Fizzlebang
                                 temp->CastSpell(me, 67888, false);
@@ -699,7 +699,7 @@ class npc_tirion_toc : public CreatureScript
                             _instance->SetData(TYPE_EVENT, 3092);
                             break;
                         case 3092:
-                            if (Creature* pChampionController = Unit::GetCreature((*me), _instance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
+                            if (Creature* pChampionController = ObjectAccessor::GetCreature((*me), _instance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
                                 pChampionController->AI()->SetData(1, NOT_STARTED);
                             _instance->SetData(TYPE_EVENT, 3095);
                             break;
@@ -735,12 +735,12 @@ class npc_tirion_toc : public CreatureScript
                             break;
                         case 4015:
                             _instance->DoUseDoorOrButton(_instance->GetData64(GO_MAIN_GATE_DOOR));
-                            if (Creature* temp = Unit::GetCreature((*me), _instance->GetData64(NPC_LIGHTBANE)))
+                            if (Creature* temp = ObjectAccessor::GetCreature((*me), _instance->GetData64(NPC_LIGHTBANE)))
                             {
                                 temp->GetMotionMaster()->MovePoint(1, ToCCommonLoc[8].GetPositionX(), ToCCommonLoc[8].GetPositionY(), ToCCommonLoc[8].GetPositionZ());
                                 temp->SetVisible(true);
                             }
-                            if (Creature* temp = Unit::GetCreature((*me), _instance->GetData64(NPC_DARKBANE)))
+                            if (Creature* temp = ObjectAccessor::GetCreature((*me), _instance->GetData64(NPC_DARKBANE)))
                             {
                                 temp->GetMotionMaster()->MovePoint(1, ToCCommonLoc[9].GetPositionX(), ToCCommonLoc[9].GetPositionY(), ToCCommonLoc[9].GetPositionZ());
                                 temp->SetVisible(true);
@@ -779,7 +779,7 @@ class npc_tirion_toc : public CreatureScript
                             _instance->SetData(TYPE_EVENT, 6005);
                             break;
                         case 6005:
-                            if (Creature* tirionFordring = Unit::GetCreature((*me), _instance->GetData64(NPC_TIRION_FORDRING)))
+                            if (Creature* tirionFordring = ObjectAccessor::GetCreature((*me), _instance->GetData64(NPC_TIRION_FORDRING)))
                                 tirionFordring->AI()->Talk(SAY_STAGE_4_06);
                             _updateTimer = 20*IN_MILLISECONDS;
                             _instance->SetData(TYPE_EVENT, 6010);
@@ -787,7 +787,7 @@ class npc_tirion_toc : public CreatureScript
                         case 6010:
                             if (IsHeroic())
                             {
-                                if (Creature* tirionFordring = Unit::GetCreature((*me), _instance->GetData64(NPC_TIRION_FORDRING)))
+                                if (Creature* tirionFordring = ObjectAccessor::GetCreature((*me), _instance->GetData64(NPC_TIRION_FORDRING)))
                                     tirionFordring->AI()->Talk(SAY_STAGE_4_07);
                                 _updateTimer = 1*MINUTE*IN_MILLISECONDS;
                                 _instance->SetBossState(BOSS_ANUBARAK, SPECIAL);

src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp

@@ -314,7 +314,7 @@ public:
         {
             if (InstanceScript* instance = me->GetInstanceScript())
                 if (uint64 guid = instance->GetData64(DATA_NOVOS))
-                    if (Creature* novos = Creature::GetCreature(*me, guid))
+                    if (Creature* novos = ObjectAccessor::GetCreature(*me, guid))
                         novos->AI()->JustSummoned(summon);
 
             if (summon)

src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp

@@ -2021,12 +2021,12 @@ class at_hor_waves_restarter : public AreaTriggerScript
             {
                 _instance->ProcessEvent(0, EVENT_SPAWN_WAVES);
 
-                if (Creature* falric = player->GetCreature(*player, _instance->GetData64(DATA_FALRIC)))
+                if (Creature* falric = ObjectAccessor::GetCreature(*player, _instance->GetData64(DATA_FALRIC)))
                 {
                     falric->CastSpell(falric, SPELL_BOSS_SPAWN_AURA, true);
                     falric->SetVisible(true);
                 }
-                if (Creature* marwyn = player->GetCreature(*player, _instance->GetData64(DATA_MARWYN)))
+                if (Creature* marwyn = ObjectAccessor::GetCreature(*player, _instance->GetData64(DATA_MARWYN)))
                 {
                     marwyn->CastSpell(marwyn, SPELL_BOSS_SPAWN_AURA, true);
                     marwyn->SetVisible(true);

src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp

@@ -113,7 +113,7 @@ class boss_garfrost : public CreatureScript
                 Talk(SAY_DEATH);
                 me->RemoveAllGameObjects();
 
-                if (Creature* tyrannus = me->GetCreature(*me, instance->GetData64(DATA_TYRANNUS)))
+                if (Creature* tyrannus = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_TYRANNUS)))
                     tyrannus->AI()->Talk(SAY_TYRANNUS_DEATH);
             }
 

src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp

@@ -362,7 +362,7 @@ class boss_krick : public CreatureScript
                     {
                         case EVENT_OUTRO_1:
                         {
-                            if (Creature* temp = me->GetCreature(*me, _instanceScript->GetData64(DATA_JAINA_SYLVANAS_1)))
+                            if (Creature* temp = ObjectAccessor::GetCreature(*me, _instanceScript->GetData64(DATA_JAINA_SYLVANAS_1)))
                                 temp->DespawnOrUnsummon();
 
                             Creature* jainaOrSylvanas = NULL;
@@ -410,7 +410,7 @@ class boss_krick : public CreatureScript
                             _events.ScheduleEvent(EVENT_OUTRO_6, 1000);
                             break;
                         case EVENT_OUTRO_6:
-                            if (Creature* tyrannus = me->GetCreature(*me, _instanceScript->GetData64(DATA_TYRANNUS_EVENT)))
+                            if (Creature* tyrannus = ObjectAccessor::GetCreature(*me, _instanceScript->GetData64(DATA_TYRANNUS_EVENT)))
                             {
                                 tyrannus->SetSpeed(MOVE_FLIGHT, 3.5f, true);
                                 tyrannus->GetMotionMaster()->MovePoint(1, outroPos[4]);

src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp

@@ -235,7 +235,7 @@ class boss_tyrannus : public CreatureScript
                             me->GetMotionMaster()->MovePoint(0, miscPos);
                             break;
                         case EVENT_COMBAT_START:
-                            if (Creature* rimefang = me->GetCreature(*me, instance->GetData64(DATA_RIMEFANG)))
+                            if (Creature* rimefang = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_RIMEFANG)))
                                 rimefang->AI()->DoAction(ACTION_START_RIMEFANG);    //set rimefang also infight
                             events.SetPhase(PHASE_COMBAT);
                             me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -357,7 +357,7 @@ class boss_rimefang : public CreatureScript
                             _events.ScheduleEvent(EVENT_ICY_BLAST, 15000, 0, PHASE_COMBAT);
                             break;
                         case EVENT_HOARFROST:
-                            if (Unit* target = me->GetUnit(*me, _hoarfrostTargetGUID))
+                            if (Unit* target = ObjectAccessor::GetUnit(*me, _hoarfrostTargetGUID))
                             {
                                 DoCast(target, SPELL_HOARFROST);
                                 _hoarfrostTargetGUID = 0;

src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp

@@ -278,7 +278,7 @@ class boss_drakkari_elemental : public CreatureScript
                 if (killer == me)
                     return;
 
-                if (Creature* colossus = Unit::GetCreature(*me, instance->GetData64(DATA_DRAKKARI_COLOSSUS)))
+                if (Creature* colossus = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_DRAKKARI_COLOSSUS)))
                     killer->Kill(colossus);
             }
 
@@ -314,7 +314,7 @@ class boss_drakkari_elemental : public CreatureScript
                 {
                     case ACTION_RETURN_TO_COLOSSUS:
                         DoCast(SPELL_SURGE_VISUAL);
-                        if (Creature* colossus = Unit::GetCreature(*me, instance->GetData64(DATA_DRAKKARI_COLOSSUS)))
+                        if (Creature* colossus = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_DRAKKARI_COLOSSUS)))
                             // what if the elemental is more than 80 yards from drakkari colossus ?
                             DoCast(colossus, SPELL_MERGE, true);
                         break;
@@ -325,7 +325,7 @@ class boss_drakkari_elemental : public CreatureScript
             {
                 if (HealthBelowPct(50) && instance)
                 {
-                    if (Creature* colossus = Unit::GetCreature(*me, instance->GetData64(DATA_DRAKKARI_COLOSSUS)))
+                    if (Creature* colossus = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_DRAKKARI_COLOSSUS)))
                     {
                         if (colossus->AI()->GetData(DATA_COLOSSUS_PHASE) ==  COLOSSUS_PHASE_FIRST_ELEMENTAL_SUMMON)
                         {
@@ -423,7 +423,7 @@ public:
 
             if (id == 1)
             {
-                if (Creature* colossus = Unit::GetCreature(*me, instance->GetData64(DATA_DRAKKARI_COLOSSUS)))
+                if (Creature* colossus = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_DRAKKARI_COLOSSUS)))
                 {
                     colossus->AI()->DoAction(ACTION_UNFREEZE_COLOSSUS);
                     if (!colossus->AI()->GetData(DATA_INTRO_DONE))

src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp

@@ -345,7 +345,7 @@ class npc_stinky_icc : public CreatureScript
 
             void JustDied(Unit* /*killer*/) override
             {
-                if (Creature* festergut = me->GetCreature(*me, _instance->GetData64(DATA_FESTERGUT)))
+                if (Creature* festergut = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_FESTERGUT)))
                     if (festergut->IsAlive())
                         festergut->AI()->Talk(SAY_STINKY_DEAD);
             }

src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp

@@ -372,7 +372,7 @@ class boss_professor_putricide : public CreatureScript
                         instance->SetBossState(DATA_FESTERGUT, IN_PROGRESS); // needed here for delayed gate close
                         me->SetSpeed(MOVE_RUN, _baseSpeed, true);
                         DoAction(ACTION_FESTERGUT_GAS);
-                        if (Creature* festergut = Unit::GetCreature(*me, instance->GetData64(DATA_FESTERGUT)))
+                        if (Creature* festergut = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_FESTERGUT)))
                             festergut->CastSpell(festergut, SPELL_GASEOUS_BLIGHT_LARGE, false, NULL, NULL, festergut->GetGUID());
                         break;
                     case POINT_ROTFACE:
@@ -442,7 +442,7 @@ class boss_professor_putricide : public CreatureScript
                         _oozeFloodStage = 0;
                         DoZoneInCombat(me);
                         // init random sequence of floods
-                        if (Creature* rotface = Unit::GetCreature(*me, instance->GetData64(DATA_ROTFACE)))
+                        if (Creature* rotface = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_ROTFACE)))
                         {
                             std::list<Creature*> list;
                             GetCreatureListWithEntryInGrid(list, rotface, NPC_PUDDLE_STALKER, 50.0f);
@@ -469,7 +469,7 @@ class boss_professor_putricide : public CreatureScript
                     }
                     case ACTION_ROTFACE_OOZE:
                         Talk(SAY_ROTFACE_OOZE_FLOOD);
-                        if (Creature* dummy = Unit::GetCreature(*me, _oozeFloodDummyGUIDs[_oozeFloodStage]))
+                        if (Creature* dummy = ObjectAccessor::GetCreature(*me, _oozeFloodDummyGUIDs[_oozeFloodStage]))
                             dummy->CastSpell(dummy, oozeFloodSpells[_oozeFloodStage], true, NULL, NULL, me->GetGUID()); // cast from self for LoS (with prof's GUID for logs)
                         if (++_oozeFloodStage == 4)
                             _oozeFloodStage = 0;

src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp

@@ -126,7 +126,7 @@ class boss_rotface : public CreatureScript
 
                 me->setActive(true);
                 Talk(SAY_AGGRO);
-                if (Creature* professor = Unit::GetCreature(*me, instance->GetData64(DATA_PROFESSOR_PUTRICIDE)))
+                if (Creature* professor = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_PROFESSOR_PUTRICIDE)))
                     professor->AI()->DoAction(ACTION_ROTFACE_COMBAT);
 
                 DoZoneInCombat();
@@ -138,7 +138,7 @@ class boss_rotface : public CreatureScript
                 instance->DoRemoveAurasDueToSpellOnPlayers(MUTATED_INFECTION);
                 _JustDied();
                 Talk(SAY_DEATH);
-                if (Creature* professor = Unit::GetCreature(*me, instance->GetData64(DATA_PROFESSOR_PUTRICIDE)))
+                if (Creature* professor = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_PROFESSOR_PUTRICIDE)))
                     professor->AI()->DoAction(ACTION_ROTFACE_DEATH);
             }
 
@@ -158,7 +158,7 @@ class boss_rotface : public CreatureScript
             void EnterEvadeMode() override
             {
                 ScriptedAI::EnterEvadeMode();
-                if (Creature* professor = Unit::GetCreature(*me, instance->GetData64(DATA_PROFESSOR_PUTRICIDE)))
+                if (Creature* professor = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_PROFESSOR_PUTRICIDE)))
                     professor->AI()->EnterEvadeMode();
             }
 
@@ -176,7 +176,7 @@ class boss_rotface : public CreatureScript
             void JustSummoned(Creature* summon) override
             {
                 if (summon->GetEntry() == NPC_VILE_GAS_STALKER)
-                    if (Creature* professor = Unit::GetCreature(*me, instance->GetData64(DATA_PROFESSOR_PUTRICIDE)))
+                    if (Creature* professor = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_PROFESSOR_PUTRICIDE)))
                         professor->CastSpell(summon, SPELL_VILE_GAS_H, true);
             }
 
@@ -308,13 +308,13 @@ class npc_big_ooze : public CreatureScript
                 DoCast(me, SPELL_GREEN_ABOMINATION_HITTIN__YA_PROC, true);
                 events.ScheduleEvent(EVENT_STICKY_OOZE, 5000);
                 // register in Rotface's summons - not summoned with Rotface as owner
-                if (Creature* rotface = Unit::GetCreature(*me, instance->GetData64(DATA_ROTFACE)))
+                if (Creature* rotface = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_ROTFACE)))
                     rotface->AI()->JustSummoned(me);
             }
 
             void JustDied(Unit* /*killer*/) override
             {
-                if (Creature* rotface = Unit::GetCreature(*me, instance->GetData64(DATA_ROTFACE)))
+                if (Creature* rotface = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_ROTFACE)))
                     rotface->AI()->SummonedCreatureDespawn(me);
                 me->DespawnOrUnsummon();
             }
@@ -395,7 +395,7 @@ class npc_precious_icc : public CreatureScript
             void JustDied(Unit* /*killer*/) override
             {
                 _summons.DespawnAll();
-                if (Creature* rotface = Unit::GetCreature(*me, _instance->GetData64(DATA_ROTFACE)))
+                if (Creature* rotface = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_ROTFACE)))
                     if (rotface->IsAlive())
                         rotface->AI()->Talk(SAY_PRECIOUS_DIES);
             }
@@ -657,7 +657,7 @@ class spell_rotface_large_ooze_buff_combine : public SpellScriptLoader
                         GetCaster()->RemoveAurasDueToSpell(SPELL_LARGE_OOZE_BUFF_COMBINE);
                         GetCaster()->RemoveAurasDueToSpell(SPELL_LARGE_OOZE_COMBINE);
                         if (InstanceScript* instance = GetCaster()->GetInstanceScript())
-                            if (Creature* rotface = Unit::GetCreature(*GetCaster(), instance->GetData64(DATA_ROTFACE)))
+                            if (Creature* rotface = ObjectAccessor::GetCreature(*GetCaster(), instance->GetData64(DATA_ROTFACE)))
                                 if (rotface->IsAlive())
                                 {
                                     rotface->AI()->Talk(EMOTE_UNSTABLE_EXPLOSION);

src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp

@@ -138,10 +138,10 @@ public:
 
         bool DoEncounteraction(Unit* who, bool attack, bool reset, bool checkAllDead)
         {
-            Creature* Thane = Unit::GetCreature(*me, instance->GetData64(DATA_THANE));
-            Creature* Lady = Unit::GetCreature(*me, instance->GetData64(DATA_LADY));
-            Creature* Baron = Unit::GetCreature(*me, instance->GetData64(DATA_BARON));
-            Creature* Sir = Unit::GetCreature(*me, instance->GetData64(DATA_SIR));
+            Creature* Thane = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_THANE));
+            Creature* Lady = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_LADY));
+            Creature* Baron = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_BARON));
+            Creature* Sir = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_SIR));
 
             if (Thane && Lady && Baron && Sir)
             {
@@ -226,7 +226,7 @@ public:
                 movementCompleted = true;
                 me->SetReactState(REACT_AGGRESSIVE);
 
-                Unit* eventStarter = Unit::GetUnit(*me, uiEventStarterGUID);
+                Unit* eventStarter = ObjectAccessor::GetUnit(*me, uiEventStarterGUID);
 
                 if (eventStarter && me->IsValidAttackTarget(eventStarter))
                     AttackStart(eventStarter);

src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp

@@ -257,25 +257,25 @@ class boss_gothik : public CreatureScript
                     {
                         case NPC_LIVE_TRAINEE:
                         {
-                            if (Creature* liveTrigger = Unit::GetCreature(*me, LiveTriggerGUID[0]))
+                            if (Creature* liveTrigger = ObjectAccessor::GetCreature(*me, LiveTriggerGUID[0]))
                                 DoSummon(NPC_LIVE_TRAINEE, liveTrigger, 1);
-                            if (Creature* liveTrigger1 = Unit::GetCreature(*me, LiveTriggerGUID[1]))
+                            if (Creature* liveTrigger1 = ObjectAccessor::GetCreature(*me, LiveTriggerGUID[1]))
                                 DoSummon(NPC_LIVE_TRAINEE, liveTrigger1, 1);
-                            if (Creature* liveTrigger2 = Unit::GetCreature(*me, LiveTriggerGUID[2]))
+                            if (Creature* liveTrigger2 = ObjectAccessor::GetCreature(*me, LiveTriggerGUID[2]))
                                 DoSummon(NPC_LIVE_TRAINEE, liveTrigger2, 1);
                             break;
                         }
                         case NPC_LIVE_KNIGHT:
                         {
-                            if (Creature* liveTrigger3 = Unit::GetCreature(*me, LiveTriggerGUID[3]))
+                            if (Creature* liveTrigger3 = ObjectAccessor::GetCreature(*me, LiveTriggerGUID[3]))
                                 DoSummon(NPC_LIVE_KNIGHT, liveTrigger3, 1);
-                            if (Creature* liveTrigger5 = Unit::GetCreature(*me, LiveTriggerGUID[5]))
+                            if (Creature* liveTrigger5 = ObjectAccessor::GetCreature(*me, LiveTriggerGUID[5]))
                                 DoSummon(NPC_LIVE_KNIGHT, liveTrigger5, 1);
                             break;
                         }
                         case NPC_LIVE_RIDER:
                         {
-                            if (Creature* liveTrigger4 = Unit::GetCreature(*me, LiveTriggerGUID[4]))
+                            if (Creature* liveTrigger4 = ObjectAccessor::GetCreature(*me, LiveTriggerGUID[4]))
                                 DoSummon(NPC_LIVE_RIDER, liveTrigger4, 1);
                             break;
                         }
@@ -287,21 +287,21 @@ class boss_gothik : public CreatureScript
                     {
                         case NPC_LIVE_TRAINEE:
                         {
-                            if (Creature* liveTrigger = Unit::GetCreature(*me, LiveTriggerGUID[4]))
+                            if (Creature* liveTrigger = ObjectAccessor::GetCreature(*me, LiveTriggerGUID[4]))
                                 DoSummon(NPC_LIVE_TRAINEE, liveTrigger, 1);
-                            if (Creature* liveTrigger2 = Unit::GetCreature(*me, LiveTriggerGUID[4]))
+                            if (Creature* liveTrigger2 = ObjectAccessor::GetCreature(*me, LiveTriggerGUID[4]))
                                 DoSummon(NPC_LIVE_TRAINEE, liveTrigger2, 1);
                             break;
                         }
                         case NPC_LIVE_KNIGHT:
                         {
-                            if (Creature* liveTrigger5 = Unit::GetCreature(*me, LiveTriggerGUID[4]))
+                            if (Creature* liveTrigger5 = ObjectAccessor::GetCreature(*me, LiveTriggerGUID[4]))
                                 DoSummon(NPC_LIVE_KNIGHT, liveTrigger5, 1);
                             break;
                         }
                         case NPC_LIVE_RIDER:
                         {
-                            if (Creature* liveTrigger4 = Unit::GetCreature(*me, LiveTriggerGUID[4]))
+                            if (Creature* liveTrigger4 = ObjectAccessor::GetCreature(*me, LiveTriggerGUID[4]))
                                 DoSummon(NPC_LIVE_RIDER, liveTrigger4, 1);
                             break;
                         }
@@ -359,7 +359,7 @@ class boss_gothik : public CreatureScript
                 if (spellId && me->IsInCombat())
                 {
                     me->HandleEmoteCommand(EMOTE_ONESHOT_SPELL_CAST);
-                    if (Creature* pRandomDeadTrigger = Unit::GetCreature(*me, DeadTriggerGUID[rand() % POS_DEAD]))
+                    if (Creature* pRandomDeadTrigger = ObjectAccessor::GetCreature(*me, DeadTriggerGUID[rand() % POS_DEAD]))
                         me->CastSpell(pRandomDeadTrigger, spellId, true);
                 }
             }

src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp

@@ -169,14 +169,14 @@ public:
         {
             victimGUID = guid;
             if (me->m_spells[0] && victimGUID)
-                if (Unit* victim = Unit::GetUnit(*me, victimGUID))
+                if (Unit* victim = ObjectAccessor::GetUnit(*me, victimGUID))
                     victim->CastSpell(victim, me->m_spells[0], true, NULL, NULL, me->GetGUID());
         }
 
         void JustDied(Unit* /*killer*/) override
         {
             if (me->m_spells[0] && victimGUID)
-                if (Unit* victim = Unit::GetUnit(*me, victimGUID))
+                if (Unit* victim = ObjectAccessor::GetUnit(*me, victimGUID))
                     victim->RemoveAurasDueToSpell(me->m_spells[0], me->GetGUID());
         }
     };

src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp

@@ -123,11 +123,11 @@ public:
             // Moreover, the adds may not yet be spawn. So just track down the status if mob is spawn
             // and each mob will send its status at reset (meaning that it is alive)
             checkFeugenAlive = false;
-            if (Creature* pFeugen = me->GetCreature(*me, instance->GetData64(DATA_FEUGEN)))
+            if (Creature* pFeugen = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_FEUGEN)))
                 checkFeugenAlive = pFeugen->IsAlive();
 
             checkStalaggAlive = false;
-            if (Creature* pStalagg = me->GetCreature(*me, instance->GetData64(DATA_STALAGG)))
+            if (Creature* pStalagg = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_STALAGG)))
                 checkStalaggAlive = pStalagg->IsAlive();
 
             if (!checkFeugenAlive && !checkStalaggAlive)
@@ -230,12 +230,12 @@ public:
                 {
                     if (!checkStalaggAlive)
                     {
-                        if (Creature* pStalagg = me->GetCreature(*me, instance->GetData64(DATA_STALAGG)))
+                        if (Creature* pStalagg = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_STALAGG)))
                             pStalagg->Respawn();
                     }
                     else
                     {
-                        if (Creature* pFeugen = me->GetCreature(*me, instance->GetData64(DATA_FEUGEN)))
+                        if (Creature* pFeugen = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_FEUGEN)))
                             pFeugen->Respawn();
                     }
                 }
@@ -300,7 +300,7 @@ public:
 
         void Reset() override
         {
-            if (Creature* pThaddius = me->GetCreature(*me, instance->GetData64(DATA_THADDIUS)))
+            if (Creature* pThaddius = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_THADDIUS)))
                 if (pThaddius->AI())
                     pThaddius->AI()->DoAction(ACTION_STALAGG_RESET);
             powerSurgeTimer = urand(20000, 25000);
@@ -322,7 +322,7 @@ public:
         void JustDied(Unit* /*killer*/) override
         {
             Talk(SAY_STAL_DEATH);
-            if (Creature* pThaddius = me->GetCreature(*me, instance->GetData64(DATA_THADDIUS)))
+            if (Creature* pThaddius = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_THADDIUS)))
                 if (pThaddius->AI())
                     pThaddius->AI()->DoAction(ACTION_STALAGG_DIED);
         }
@@ -334,7 +334,7 @@ public:
 
             if (magneticPullTimer <= uiDiff)
             {
-                if (Creature* pFeugen = me->GetCreature(*me, instance->GetData64(DATA_FEUGEN)))
+                if (Creature* pFeugen = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_FEUGEN)))
                 {
                     Unit* pStalaggVictim = me->GetVictim();
                     Unit* pFeugenVictim = pFeugen->GetVictim();
@@ -391,7 +391,7 @@ public:
 
         void Reset() override
         {
-            if (Creature* pThaddius = me->GetCreature(*me, instance->GetData64(DATA_THADDIUS)))
+            if (Creature* pThaddius = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_THADDIUS)))
                 if (pThaddius->AI())
                     pThaddius->AI()->DoAction(ACTION_FEUGEN_RESET);
             staticFieldTimer = 5000;
@@ -412,7 +412,7 @@ public:
         void JustDied(Unit* /*killer*/) override
         {
             Talk(SAY_FEUG_DEATH);
-            if (Creature* pThaddius = me->GetCreature(*me, instance->GetData64(DATA_THADDIUS)))
+            if (Creature* pThaddius = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_THADDIUS)))
                 if (pThaddius->AI())
                     pThaddius->AI()->DoAction(ACTION_FEUGEN_DIED);
         }

src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp

@@ -164,7 +164,7 @@ public:
 
             for (uint8 i = 0; i < 2; ++i)
             {
-                if (Creature* pStormforgedLieutenant = (Unit::GetCreature((*me), m_auiStormforgedLieutenantGUID[i])))
+                if (Creature* pStormforgedLieutenant = (ObjectAccessor::GetCreature((*me), m_auiStormforgedLieutenantGUID[i])))
                 {
                     if (!pStormforgedLieutenant->IsAlive())
                         pStormforgedLieutenant->Respawn();

src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp

@@ -164,7 +164,7 @@ public:
 
             for (std::list<uint64>::const_iterator itr = m_lGolemGUIDList.begin(); itr != m_lGolemGUIDList.end(); ++itr)
             {
-                if (Creature* temp = Unit::GetCreature(*me, *itr))
+                if (Creature* temp = ObjectAccessor::GetCreature(*me, *itr))
                 {
                     if (temp->IsAlive())
                         temp->DespawnOrUnsummon();
@@ -181,7 +181,7 @@ public:
 
             for (std::list<uint64>::const_iterator itr = m_lGolemGUIDList.begin(); itr != m_lGolemGUIDList.end(); ++itr)
             {
-                if (Creature* temp = Unit::GetCreature(*me, *itr))
+                if (Creature* temp = ObjectAccessor::GetCreature(*me, *itr))
                 {
                     // Only shatter brittle golems
                     if (temp->IsAlive() && temp->GetEntry() == NPC_BRITTLE_GOLEM)

src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp

@@ -211,7 +211,7 @@ public:
                         if (!KaddrakGUIDList.empty())
                             for (std::list<uint64>::const_iterator itr = KaddrakGUIDList.begin(); itr != KaddrakGUIDList.end(); ++itr)
                             {
-                                if (Creature* pKaddrak = Unit::GetCreature(*me, *itr))
+                                if (Creature* pKaddrak = ObjectAccessor::GetCreature(*me, *itr))
                                 {
                                     if (pKaddrak->IsAlive())
                                         pKaddrak->CastSpell(target, DUNGEON_MODE(SPELL_GLARE_OF_THE_TRIBUNAL, H_SPELL_GLARE_OF_THE_TRIBUNAL), true);
@@ -331,7 +331,7 @@ public:
                 return;
             for (std::list<uint64>::const_iterator itr = lDwarfGUIDList.begin(); itr != lDwarfGUIDList.end(); ++itr)
             {
-                Creature* temp = Unit::GetCreature(*me, instance ? (*itr) : 0);
+                Creature* temp = ObjectAccessor::GetCreature(*me, instance ? (*itr) : 0);
                 if (temp && temp->IsAlive())
                     temp->DespawnOrUnsummon();
             }
@@ -446,7 +446,7 @@ public:
                         JumpToNextStep(0);
                         break;
                     case 5:
-                        if (Creature* temp = (Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))))
+                        if (Creature* temp = (ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))))
                             temp->AI()->Talk(SAY_EVENT_INTRO_3_ABED);
                         JumpToNextStep(8500);
                         break;
@@ -455,14 +455,14 @@ public:
                         JumpToNextStep(6500);
                         break;
                     case 7:
-                        if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK)))
+                        if (Creature* temp = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_KADDRAK)))
                             temp->AI()->Talk(SAY_EVENT_A_2_KADD);
                         JumpToNextStep(12500);
                         break;
                     case 8:
                         Talk(SAY_EVENT_A_3);
                         instance->HandleGameObject(instance->GetData64(DATA_GO_KADDRAK), true);
-                        if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID))
+                        if (Creature* temp = ObjectAccessor::GetCreature(*me, uiControllerGUID))
                             CAST_AI(npc_tribuna_controller::npc_tribuna_controllerAI, temp->AI())->bKaddrakActivated = true;
                         JumpToNextStep(5000);
                         break;
@@ -476,7 +476,7 @@ public:
                         JumpToNextStep(6000);
                         break;
                     case 11:
-                        if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK)))
+                        if (Creature* temp = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MARNAK)))
                             temp->AI()->Talk(SAY_EVENT_B_2_MARN);
                         SpawnDwarf(1);
                         JumpToNextStep(20000);
@@ -484,7 +484,7 @@ public:
                     case 12:
                         Talk(SAY_EVENT_B_3);
                         instance->HandleGameObject(instance->GetData64(DATA_GO_MARNAK), true);
-                        if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID))
+                        if (Creature* temp = ObjectAccessor::GetCreature(*me, uiControllerGUID))
                             CAST_AI(npc_tribuna_controller::npc_tribuna_controllerAI, temp->AI())->bMarnakActivated = true;
                         JumpToNextStep(10000);
                         break;
@@ -506,7 +506,7 @@ public:
                         JumpToNextStep(20000);
                         break;
                     case 17:
-                        if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
+                        if (Creature* temp = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
                             temp->AI()->Talk(SAY_EVENT_C_2_ABED);
                         SpawnDwarf(1);
                         JumpToNextStep(20000);
@@ -514,7 +514,7 @@ public:
                     case 18:
                         Talk(SAY_EVENT_C_3);
                         instance->HandleGameObject(instance->GetData64(DATA_GO_ABEDNEUM), true);
-                        if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID))
+                        if (Creature* temp = ObjectAccessor::GetCreature(*me, uiControllerGUID))
                             CAST_AI(npc_tribuna_controller::npc_tribuna_controllerAI, temp->AI())->bAbedneumActivated = true;
                         JumpToNextStep(5000);
                         break;
@@ -532,7 +532,7 @@ public:
                         JumpToNextStep(20000);
                         break;
                     case 22:
-                        if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
+                        if (Creature* temp = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
                             temp->AI()->Talk(SAY_EVENT_D_2_ABED);
                         SpawnDwarf(1);
                         JumpToNextStep(5000);
@@ -555,7 +555,7 @@ public:
                         JumpToNextStep(10000);
                         break;
                     case 27:
-                        if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
+                        if (Creature* temp = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
                             temp->AI()->Talk(SAY_EVENT_D_4_ABED);
                         SpawnDwarf(1);
                         JumpToNextStep(10000);
@@ -565,7 +565,7 @@ public:
                         Talk(SAY_EVENT_END_01);
                         me->SetStandState(UNIT_STAND_STATE_STAND);
                         instance->HandleGameObject(instance->GetData64(DATA_GO_SKY_FLOOR), true);
-                        if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID))
+                        if (Creature* temp = ObjectAccessor::GetCreature(*me, uiControllerGUID))
                             temp->DealDamage(temp, temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
                         bIsBattle = true;
                         SetEscortPaused(false);
@@ -578,7 +578,7 @@ public:
                         JumpToNextStep(5500);
                         break;
                     case 30:
-                        if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
+                        if (Creature* temp = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
                             temp->AI()->Talk(SAY_EVENT_END_03_ABED);
                         JumpToNextStep(8500);
                         break;
@@ -587,7 +587,7 @@ public:
                         JumpToNextStep(11500);
                         break;
                     case 32:
-                        if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
+                        if (Creature* temp = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
                             temp->AI()->Talk(SAY_EVENT_END_05_ABED);
                         JumpToNextStep(11500);
                         break;
@@ -596,7 +596,7 @@ public:
                         JumpToNextStep(4500);
                         break;
                     case 34:
-                        if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
+                        if (Creature* temp = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
                             temp->AI()->Talk(SAY_EVENT_END_07_ABED);
                         JumpToNextStep(22500);
                         break;
@@ -605,7 +605,7 @@ public:
                         JumpToNextStep(7500);
                         break;
                     case 36:
-                        if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK)))
+                        if (Creature* temp = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_KADDRAK)))
                             temp->AI()->Talk(SAY_EVENT_END_09_KADD);
                         JumpToNextStep(18500);
                         break;
@@ -614,7 +614,7 @@ public:
                         JumpToNextStep(5500);
                         break;
                     case 38:
-                        if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK)))
+                        if (Creature* temp = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_KADDRAK)))
                             temp->AI()->Talk(SAY_EVENT_END_11_KADD);
                         JumpToNextStep(20500);
                         break;
@@ -623,7 +623,7 @@ public:
                         JumpToNextStep(2500);
                         break;
                     case 40:
-                        if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK)))
+                        if (Creature* temp = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_KADDRAK)))
                             temp->AI()->Talk(SAY_EVENT_END_13_KADD);
                         JumpToNextStep(19500);
                         break;
@@ -632,7 +632,7 @@ public:
                         JumpToNextStep(10500);
                         break;
                     case 42:
-                        if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK)))
+                        if (Creature* temp = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MARNAK)))
                             temp->AI()->Talk(SAY_EVENT_END_15_MARN);
                         JumpToNextStep(6500);
                         break;
@@ -641,7 +641,7 @@ public:
                         JumpToNextStep(6500);
                         break;
                     case 44:
-                        if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK)))
+                        if (Creature* temp = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MARNAK)))
                             temp->AI()->Talk(SAY_EVENT_END_17_MARN);
                         JumpToNextStep(25500);
                         break;
@@ -650,7 +650,7 @@ public:
                         JumpToNextStep(23500);
                         break;
                     case 46:
-                        if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK)))
+                        if (Creature* temp = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MARNAK)))
                             temp->AI()->Talk(SAY_EVENT_END_19_MARN);
                         JumpToNextStep(3500);
                         break;
@@ -659,7 +659,7 @@ public:
                         JumpToNextStep(8500);
                         break;
                     case 48:
-                        if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
+                        if (Creature* temp = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
                             temp->AI()->Talk(SAY_EVENT_END_21_ABED);
                         JumpToNextStep(5500);
                         break;

src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp

@@ -332,7 +332,7 @@ class boss_saronite_animus : public CreatureScript
 
             void JustDied(Unit* /*killer*/) override
             {
-                if (Creature* Vezax = me->GetCreature(*me, instance->GetData64(BOSS_VEZAX)))
+                if (Creature* Vezax = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_VEZAX)))
                     Vezax->AI()->DoAction(ACTION_ANIMUS_DIE);
             }
 
@@ -427,7 +427,7 @@ class npc_saronite_vapors : public CreatureScript
                     DoCast(me, SPELL_SARONITE_VAPORS);
                     me->DespawnOrUnsummon(30000);
 
-                    if (Creature* Vezax = me->GetCreature(*me, instance->GetData64(BOSS_VEZAX)))
+                    if (Creature* Vezax = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_VEZAX)))
                         Vezax->AI()->DoAction(ACTION_VAPORS_DIE);
                 }
             }

src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp

@@ -399,7 +399,7 @@ class npc_scorch_ground : public CreatureScript
                 {
                     if (_heatTimer <= uiDiff)
                     {
-                        Creature* construct = me->GetCreature(*me, _constructGUID);
+                        Creature* construct = ObjectAccessor::GetCreature(*me, _constructGUID);
                         if (construct && !construct->HasAura(SPELL_MOLTEN))
                         {
                             me->AddAura(SPELL_HEAT, construct);

src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp

@@ -234,7 +234,7 @@ class boss_kologarn : public CreatureScript
                 // Victim gets 67351
                 if (eyebeamTarget)
                 {
-                    if (Unit* target = Unit::GetUnit(*summon, eyebeamTarget))
+                    if (Unit* target = ObjectAccessor::GetUnit(*summon, eyebeamTarget))
                     {
                         summon->Attack(target, false);
                         summon->GetMotionMaster()->MoveChase(target);

src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp

@@ -457,7 +457,7 @@ class npc_xt002_heart : public CreatureScript
 
             void JustDied(Unit* /*killer*/) override
             {
-                Creature* xt002 = _instance ? me->GetCreature(*me, _instance->GetData64(BOSS_XT002)) : NULL;
+                Creature* xt002 = _instance ? ObjectAccessor::GetCreature(*me, _instance->GetData64(BOSS_XT002)) : NULL;
                 if (!xt002 || !xt002->AI())
                     return;
 
@@ -503,7 +503,7 @@ class npc_scrapbot : public CreatureScript
 
                 _rangeCheckTimer = 500;
 
-                if (Creature* pXT002 = me->GetCreature(*me, _instance->GetData64(BOSS_XT002)))
+                if (Creature* pXT002 = ObjectAccessor::GetCreature(*me, _instance->GetData64(BOSS_XT002)))
                     me->GetMotionMaster()->MoveFollow(pXT002, 0.0f, 0.0f);
             }
 
@@ -511,7 +511,7 @@ class npc_scrapbot : public CreatureScript
             {
                 if (_rangeCheckTimer <= diff)
                 {
-                    if (Creature* xt002 = me->GetCreature(*me, _instance->GetData64(BOSS_XT002)))
+                    if (Creature* xt002 = ObjectAccessor::GetCreature(*me, _instance->GetData64(BOSS_XT002)))
                     {
                         if (me->IsWithinMeleeRange(xt002))
                         {
@@ -560,7 +560,7 @@ class npc_pummeller : public CreatureScript
                 _trampleTimer = TIMER_TRAMPLE;
                 _uppercutTimer = TIMER_UPPERCUT;
 
-                if (Creature* xt002 = me->GetCreature(*me, _instance->GetData64(BOSS_XT002)))
+                if (Creature* xt002 = ObjectAccessor::GetCreature(*me, _instance->GetData64(BOSS_XT002)))
                 {
                     Position pos = xt002->GetPosition();
                     me->GetMotionMaster()->MovePoint(0, pos);
@@ -668,7 +668,7 @@ class npc_boombot : public CreatureScript
                 me->SetFloatValue(UNIT_FIELD_MAXDAMAGE, 18000.0f);
 
                 /// @todo proper waypoints?
-                if (Creature* pXT002 = me->GetCreature(*me, _instance->GetData64(BOSS_XT002)))
+                if (Creature* pXT002 = ObjectAccessor::GetCreature(*me, _instance->GetData64(BOSS_XT002)))
                     me->GetMotionMaster()->MoveFollow(pXT002, 0.0f, 0.0f);
             }
 

src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp

@@ -206,7 +206,7 @@ public:
 
             Summons.DespawnAll();
             me->SetSpeed(MOVE_FLIGHT, 3.0f);
-            if ((Unit::GetCreature(*me, m_uiGraufGUID) == NULL) && !me->IsMounted())
+            if ((ObjectAccessor::GetCreature(*me, m_uiGraufGUID) == NULL) && !me->IsMounted())
                  me->SummonCreature(NPC_GRAUF, Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 3.0f);
             instance->SetBossState(DATA_SKADI_THE_RUTHLESS, NOT_STARTED);
             instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
@@ -217,7 +217,7 @@ public:
             me->SetCanFly(false);
             me->Dismount();
             me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE);
-            if (!Unit::GetCreature(*me, m_uiGraufGUID))
+            if (!ObjectAccessor::GetCreature(*me, m_uiGraufGUID))
                 me->SummonCreature(NPC_GRAUF, Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 3.0f);
         }
 
@@ -469,7 +469,7 @@ public:
         if (!instance)
             return false;
 
-        if (Creature* pSkadi = Unit::GetCreature(*go, instance->GetData64(DATA_SKADI_THE_RUTHLESS)))
+        if (Creature* pSkadi = ObjectAccessor::GetCreature(*go, instance->GetData64(DATA_SKADI_THE_RUTHLESS)))
             player->CastSpell(pSkadi, SPELL_RAPID_FIRE, true);
 
         return false;

src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp

@@ -369,7 +369,7 @@ public:
         void DespawnBoatGhosts(uint64& m_uiCreatureGUID)
         {
             if (m_uiCreatureGUID)
-                if (Creature* temp = Unit::GetCreature(*me, m_uiCreatureGUID))
+                if (Creature* temp = ObjectAccessor::GetCreature(*me, m_uiCreatureGUID))
                     temp->DisappearAndDie();
 
             m_uiCreatureGUID = 0;

src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp

@@ -103,7 +103,7 @@ class boss_emalon : public CreatureScript
                 {
                     for (std::list<uint64>::const_iterator itr = summons.begin(); itr != summons.end(); ++itr)
                     {
-                        Creature* minion = Unit::GetCreature(*me, *itr);
+                        Creature* minion = ObjectAccessor::GetCreature(*me, *itr);
                         if (minion && minion->IsAlive() && !minion->GetVictim() && minion->AI())
                             minion->AI()->AttackStart(who);
                     }
@@ -143,7 +143,7 @@ class boss_emalon : public CreatureScript
                         case EVENT_OVERCHARGE:
                             if (!summons.empty())
                             {
-                                Creature* minion = Unit::GetCreature(*me, Trinity::Containers::SelectRandomContainerElement(summons));
+                                Creature* minion = ObjectAccessor::GetCreature(*me, Trinity::Containers::SelectRandomContainerElement(summons));
                                 if (minion && minion->IsAlive())
                                 {
                                     minion->CastSpell(me, SPELL_OVERCHARGED, true);

src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp

@@ -242,7 +242,7 @@ public:
                         if (!m_waterElements.empty())
                         {
                             for (std::list<uint64>::const_iterator itr = m_waterElements.begin(); itr != m_waterElements.end(); ++itr)
-                                if (Creature* temp = Unit::GetCreature(*me, *itr))
+                                if (Creature* temp = ObjectAccessor::GetCreature(*me, *itr))
                                     if (temp->IsAlive())
                                     {
                                         bIsWaterElementsAlive = true;
@@ -362,7 +362,7 @@ public:
         {
             if (uiRangeCheck_Timer < uiDiff)
             {
-                if (Creature* pIchoron = Unit::GetCreature(*me, instance->GetData64(DATA_ICHORON)))
+                if (Creature* pIchoron = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_ICHORON)))
                 {
                     if (me->IsWithinDist(pIchoron, 2.0f, false))
                     {
@@ -379,7 +379,7 @@ public:
         void JustDied(Unit* /*killer*/) override
         {
             DoCast(me, SPELL_SPLASH);
-            if (Creature* pIchoron = Unit::GetCreature(*me, instance->GetData64(DATA_ICHORON)))
+            if (Creature* pIchoron = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_ICHORON)))
                 if (pIchoron->AI())
                     pIchoron->AI()->DoAction(ACTION_WATER_ELEMENT_KILLED);
         }

src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp

@@ -254,7 +254,7 @@ public:
 
             if (uiRangeCheck_Timer < uiDiff)
             {
-                if (Creature* pXevozz = Unit::GetCreature(*me, instance->GetData64(DATA_XEVOZZ)))
+                if (Creature* pXevozz = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_XEVOZZ)))
                 {
                     float fDistance = me->GetDistance2d(pXevozz);
                     if (fDistance <= 3)

src/server/scripts/Northrend/VioletHold/violet_hold.cpp

@@ -535,7 +535,7 @@ public:
         {
             me->CastSpell(me, SABOTEUR_SHIELD_DISRUPTION, false);
             me->DisappearAndDie();
-            Creature* pSaboPort = Unit::GetCreature((*me), instance->GetData64(DATA_SABOTEUR_PORTAL));
+            Creature* pSaboPort = ObjectAccessor::GetCreature((*me), instance->GetData64(DATA_SABOTEUR_PORTAL));
             if (pSaboPort)
                 pSaboPort->DisappearAndDie();
             instance->SetData(DATA_START_BOSS_ENCOUNTER, 1);

src/server/scripts/Northrend/zone_borean_tundra.cpp

@@ -1071,8 +1071,8 @@ public:
 
             if (phaseTimer <= diff)
             {
-                Creature* talbot = me->GetCreature(*me, talbotGUID);
-                Creature* arthas = me->GetCreature(*me, arthasGUID);
+                Creature* talbot = ObjectAccessor::GetCreature(*me, talbotGUID);
+                Creature* arthas = ObjectAccessor::GetCreature(*me, arthasGUID);
                 switch (phase)
                 {
                     case 1:
@@ -1209,9 +1209,9 @@ public:
                         break;
 
                    case 17:
-                        if (Creature* leryssa = me->GetCreature(*me, leryssaGUID))
+                        if (Creature* leryssa = ObjectAccessor::GetCreature(*me, leryssaGUID))
                             leryssa->RemoveFromWorld();
-                        if (Creature* arlos= me->GetCreature(*me, arlosGUID))
+                        if (Creature* arlos= ObjectAccessor::GetCreature(*me, arlosGUID))
                             arlos->RemoveFromWorld();
                         if (talbot)
                             talbot->RemoveFromWorld();
@@ -1230,16 +1230,16 @@ public:
 
         void JustDied(Unit* /*killer*/) override
         {
-            if (Creature* talbot = me->GetCreature(*me, talbotGUID))
+            if (Creature* talbot = ObjectAccessor::GetCreature(*me, talbotGUID))
                 talbot->RemoveFromWorld();
 
-            if (Creature* leryssa = me->GetCreature(*me, leryssaGUID))
+            if (Creature* leryssa = ObjectAccessor::GetCreature(*me, leryssaGUID))
                 leryssa->RemoveFromWorld();
 
-            if (Creature* arlos = me->GetCreature(*me, arlosGUID))
+            if (Creature* arlos = ObjectAccessor::GetCreature(*me, arlosGUID))
                 arlos->RemoveFromWorld();
 
-            if (Creature* arthas = me->GetCreature(*me, arthasGUID))
+            if (Creature* arthas = ObjectAccessor::GetCreature(*me, arthasGUID))
                 arthas->RemoveFromWorld();
         }
     };
@@ -1433,8 +1433,8 @@ public:
             if (!leryssaGUID || !arlosGUID)
                 return;
 
-            Creature* leryssa = Unit::GetCreature(*me, leryssaGUID);
-            Creature* arlos = Unit::GetCreature(*me, arlosGUID);
+            Creature* leryssa = ObjectAccessor::GetCreature(*me, leryssaGUID);
+            Creature* arlos = ObjectAccessor::GetCreature(*me, arlosGUID);
             if (!leryssa || !arlos)
                 return;
 

src/server/scripts/Northrend/zone_crystalsong_forest.cpp

@@ -97,7 +97,7 @@ public:
 
             }
 
-            if (Creature* pOrb = me->GetCreature(*me, targetGUID))
+            if (Creature* pOrb = ObjectAccessor::GetCreature(*me, targetGUID))
                 DoCast(pOrb, SPELL_TRANSITUS_SHIELD_BEAM);
 
         }

src/server/scripts/Northrend/zone_grizzly_hills.cpp

@@ -85,18 +85,18 @@ public:
                         _mrfloppyGUID = Mrfloppy->GetGUID();
                     break;
                 case 10:
-                    if (Unit::GetCreature(*me, _mrfloppyGUID))
+                    if (ObjectAccessor::GetCreature(*me, _mrfloppyGUID))
                     {
                         Talk(SAY_WORGHAGGRO1);
                         me->SummonCreature(NPC_HUNGRY_WORG, me->GetPositionX()+5, me->GetPositionY()+2, me->GetPositionZ()+1, 3.229f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000);
                     }
                     break;
                 case 11:
-                    if (Creature* Mrfloppy = Unit::GetCreature(*me, _mrfloppyGUID))
+                    if (Creature* Mrfloppy = ObjectAccessor::GetCreature(*me, _mrfloppyGUID))
                         Mrfloppy->GetMotionMaster()->MoveFollow(me, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
                     break;
                 case 17:
-                    if (Creature* Mrfloppy = Unit::GetCreature(*me, _mrfloppyGUID))
+                    if (Creature* Mrfloppy = ObjectAccessor::GetCreature(*me, _mrfloppyGUID))
                         Mrfloppy->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ());
                     Talk(SAY_WORGRAGGRO3);
                     if (Creature* RWORG = me->SummonCreature(NPC_RAVENOUS_WORG, me->GetPositionX()+10, me->GetPositionY()+8, me->GetPositionZ()+2, 3.229f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000))
@@ -106,31 +106,31 @@ public:
                     }
                     break;
                 case 18:
-                    if (Creature* Mrfloppy = Unit::GetCreature(*me, _mrfloppyGUID))
+                    if (Creature* Mrfloppy = ObjectAccessor::GetCreature(*me, _mrfloppyGUID))
                     {
-                        if (Creature* RWORG = Unit::GetCreature(*me, _RavenousworgGUID))
+                        if (Creature* RWORG = ObjectAccessor::GetCreature(*me, _RavenousworgGUID))
                             RWORG->GetMotionMaster()->MovePoint(0, Mrfloppy->GetPositionX(), Mrfloppy->GetPositionY(), Mrfloppy->GetPositionZ());
                         DoCast(Mrfloppy, SPELL_MRFLOPPY);
                     }
                     break;
                 case 19:
-                    if (Creature* Mrfloppy = Unit::GetCreature(*me, _mrfloppyGUID))
+                    if (Creature* Mrfloppy = ObjectAccessor::GetCreature(*me, _mrfloppyGUID))
                     {
                         if (Mrfloppy->HasAura(SPELL_MRFLOPPY, 0))
                         {
-                            if (Creature* RWORG = Unit::GetCreature(*me, _RavenousworgGUID))
+                            if (Creature* RWORG = ObjectAccessor::GetCreature(*me, _RavenousworgGUID))
                                 Mrfloppy->EnterVehicle(RWORG);
                         }
                     }
                     break;
                 case 20:
-                    if (Creature* RWORG = Unit::GetCreature(*me, _RavenousworgGUID))
+                    if (Creature* RWORG = ObjectAccessor::GetCreature(*me, _RavenousworgGUID))
                         RWORG->HandleEmoteCommand(34);
                     break;
                 case 21:
-                    if (Creature* Mrfloppy = Unit::GetCreature(*me, _mrfloppyGUID))
+                    if (Creature* Mrfloppy = ObjectAccessor::GetCreature(*me, _mrfloppyGUID))
                     {
-                        if (Creature* RWORG = Unit::GetCreature(*me, _RavenousworgGUID))
+                        if (Creature* RWORG = ObjectAccessor::GetCreature(*me, _RavenousworgGUID))
                         {
                             RWORG->Kill(Mrfloppy);
                             Mrfloppy->ExitVehicle();
@@ -141,11 +141,11 @@ public:
                     }
                     break;
                 case 22:
-                    if (Creature* Mrfloppy = Unit::GetCreature(*me, _mrfloppyGUID))
+                    if (Creature* Mrfloppy = ObjectAccessor::GetCreature(*me, _mrfloppyGUID))
                     {
                         if (Mrfloppy->isDead())
                         {
-                            if (Creature* RWORG = Unit::GetCreature(*me, _RavenousworgGUID))
+                            if (Creature* RWORG = ObjectAccessor::GetCreature(*me, _RavenousworgGUID))
                                 RWORG->DisappearAndDie();
                             me->GetMotionMaster()->MovePoint(0, Mrfloppy->GetPositionX(), Mrfloppy->GetPositionY(), Mrfloppy->GetPositionZ());
                             Mrfloppy->setDeathState(ALIVE);
@@ -167,7 +167,7 @@ public:
                     break;
                 case 27:
                     me->DisappearAndDie();
-                    if (Creature* Mrfloppy = Unit::GetCreature(*me, _mrfloppyGUID))
+                    if (Creature* Mrfloppy = ObjectAccessor::GetCreature(*me, _mrfloppyGUID))
                         Mrfloppy->DisappearAndDie();
                     break;
             }