Misc: replace Unit::GetPlayer with ObjectAccessor::GetPlayer and some cosmetic changes

8 files changed, 35 insertions, 42 deletions

diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
index c8d83a54e1e..a2f98b21589 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
@@ -145,7 +145,7 @@ public:
                             break;
                         case 3:
                             me->setFaction(FACTION_HOSTILE);
-                            if (Player* target = Player::GetPlayer(*me, PlayerGUID))
+                            if (Player* target = ObjectAccessor::GetPlayer(*me, PlayerGUID))
                                 AttackStart(target);
 
                             if (instance)
diff --git a/src/server/scripts/Kalimdor/zone_azshara.cpp b/src/server/scripts/Kalimdor/zone_azshara.cpp
index 01b8b9c1bcf..f48bd1f9339 100644
--- a/src/server/scripts/Kalimdor/zone_azshara.cpp
+++ b/src/server/scripts/Kalimdor/zone_azshara.cpp
@@ -35,7 +35,6 @@ EndContentData */
 #include "ScriptedGossip.h"
 #include "Player.h"
 #include "SpellInfo.h"
-#include "WorldSession.h"
 
 /*######
 ## npc_spitelashes
@@ -371,7 +370,7 @@ public:
                     DoTeleportTo(3706.39f, -3969.15f, 35.9118f);
 
                     //begin swimming and summon depth charges
-                    Player* player = Unit::GetPlayer(*me, PlayerGUID);
+                    Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID);
                     if (!player)
                         return;
 
@@ -396,8 +395,7 @@ public:
 
             if (GrenadeTimer <= diff)
             {
-                Player* player = Unit::GetPlayer(*me, PlayerGUID);
-                if (player)
+                if (Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID))
                 {
                    Talk(SAY_RIZZLE_GRENADE, player->GetGUID());
                    DoCast(player, SPELL_RIZZLE_FROST_GRENADE, true);
@@ -407,7 +405,7 @@ public:
 
             if (CheckTimer <= diff)
             {
-                Player* player = Unit::GetPlayer(*me, PlayerGUID);
+                Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID);
                 if (!player)
                 {
                     me->DespawnOrUnsummon();
@@ -429,13 +427,6 @@ public:
 
         }
 
-        void SendText(int32 iTextEntry, Player* player)
-        {
-            LocaleConstant loc_idx = player->GetSession()->GetSessionDbLocaleIndex();
-            const char* text = sObjectMgr->GetTrinityString(iTextEntry, loc_idx);
-            sWorld->SendServerMessage(SERVER_MSG_STRING, text, player);
-        }
-
         void AttackStart(Unit* who) OVERRIDE
         {
             if (!who || PlayerGUID)
diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
index f5c8c90d921..e0d181646e1 100644
--- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
@@ -134,7 +134,7 @@ public:
                 {
                     me->RemoveAurasDueToSpell(SPELL_IRRIDATION);
 
-                    if (Player* player = Unit::GetPlayer(*me, pCaster))
+                    if (Player* player = ObjectAccessor::GetPlayer(*me, pCaster))
                     {
                         Talk(SAY_HEAL, player->GetGUID());
 
diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp
index 6885e44a245..509adb566cd 100644
--- a/src/server/scripts/Kalimdor/zone_moonglade.cpp
+++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp
@@ -350,7 +350,7 @@ public:
             if (!PlayerGUID)
                 return;
 
-            Player* player = Unit::GetPlayer(*me, PlayerGUID);
+            Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID);
             if (player && player->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE)
             {
                 player->FailQuest(10965);
@@ -361,7 +361,7 @@ public:
 
         void EnterEvadeMode() OVERRIDE
         {
-            Player* player = Unit::GetPlayer(*me, PlayerGUID);
+            Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID);
             if (player && player->IsInCombat() && player->getAttackerForHelper())
             {
                 AttackStart(player->getAttackerForHelper());
@@ -398,7 +398,7 @@ public:
             {
                 if (checkPlayerTimer <= diff)
                 {
-                    Player* player = Unit::GetPlayer(*me, PlayerGUID);
+                    Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID);
                     if (player && player->IsInCombat() && player->getAttackerForHelper())
                         AttackStart(player->getAttackerForHelper());
                     checkPlayerTimer = 1000;
@@ -407,9 +407,8 @@ public:
 
             if (EventOnWait && EventTimer <= diff)
             {
-
-                Player* player = Unit::GetPlayer(*me, PlayerGUID);
-                if (!player || (player && player->GetQuestStatus(10965) == QUEST_STATUS_NONE))
+                Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID);
+                if (!player || player->GetQuestStatus(10965) == QUEST_STATUS_NONE)
                 {
                     me->setDeathState(JUST_DIED);
                     return;
diff --git a/src/server/scripts/Kalimdor/zone_mulgore.cpp b/src/server/scripts/Kalimdor/zone_mulgore.cpp
index 5cd0b9f568b..6b42b971531 100644
--- a/src/server/scripts/Kalimdor/zone_mulgore.cpp
+++ b/src/server/scripts/Kalimdor/zone_mulgore.cpp
@@ -162,7 +162,7 @@ public:
                     switch (EventPhase)
                     {
                         case 1:
-                            if (Unit* unit = Unit::GetUnit(*me, PlayerGUID))
+                            if (Unit* unit = ObjectAccessor::GetUnit(*me, PlayerGUID))
                             {
                                 if (GameObject* go = unit->GetGameObject(SPELL_LUNCH))
                                 {
@@ -176,7 +176,7 @@ public:
                             me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USE_STANDING);
                             break;
                         case 3:
-                            if (Player* unit = Unit::GetPlayer(*me, PlayerGUID))
+                            if (Player* unit = ObjectAccessor::GetPlayer(*me, PlayerGUID))
                                 unit->TalkedToCreature(me->GetEntry(), me->GetGUID());
 
                             me->UpdateEntry(NPC_KYLE_FRIENDLY);
diff --git a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp
index afd320af3ac..7928ab10978 100644
--- a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp
+++ b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp
@@ -89,7 +89,7 @@ public:
             {
                 if (ResetTimer <= diff)
                 {
-                    if (Player* player = Unit::GetPlayer(*me, PlayerGUID))
+                    if (Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID))
                     {
                         if (player->GetTypeId() == TYPEID_PLAYER && player->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE)
                             player->FailQuest(QUEST_SHATTERED_SALUTE);
diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp
index 154f8b0f80f..fd8a1069ff7 100644
--- a/src/server/scripts/Kalimdor/zone_silithus.cpp
+++ b/src/server/scripts/Kalimdor/zone_silithus.cpp
@@ -526,7 +526,7 @@ public:
 
         void HandleAnimation()
         {
-            Player* player = Unit::GetPlayer(*me, PlayerGUID);
+            Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID);
             if (!player)
                 return;
 
@@ -1002,14 +1002,13 @@ public:
 
         void CheckEventFail()
         {
-            Player* player = Unit::GetPlayer(*me, PlayerGUID);
-
+            Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID);
             if (!player)
                 return;
 
             if (Group* EventGroup = player->GetGroup())
             {
-                Player* groupMember;
+                Player* groupMember = NULL;
 
                 uint8 GroupMemberCount = 0;
                 uint8 DeadMemberCount = 0;
@@ -1019,7 +1018,7 @@ public:
 
                 for (Group::member_citerator itr = members.begin(); itr!= members.end(); ++itr)
                 {
-                    groupMember = (Unit::GetPlayer(*me, itr->guid));
+                    groupMember = ObjectAccessor::GetPlayer(*me, itr->guid);
                     if (!groupMember)
                         continue;
                     if (!groupMember->IsWithinDistInMap(me, EVENT_AREA_RADIUS) && groupMember->GetQuestStatus(QUEST_A_PAWN_ON_THE_ETERNAL_BOARD) == QUEST_STATUS_INCOMPLETE)
diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
index 62867c46f78..122ce84091b 100644
--- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp
+++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
@@ -366,18 +366,20 @@ public:
 
         void UpdateAI(uint32 diff) OVERRIDE
         {
-            if (EventInProgress) {
-                Player* pWarrior = NULL;
+            if (EventInProgress)
+            {
+                Player* warrior = NULL;
 
                 if (PlayerGUID)
-                    pWarrior = Unit::GetPlayer(*me, PlayerGUID);
+                    warrior = ObjectAccessor::GetPlayer(*me, PlayerGUID);
 
-                if (!pWarrior)
+                if (!warrior)
                     return;
 
-                if (!pWarrior->IsAlive() && pWarrior->GetQuestStatus(1719) == QUEST_STATUS_INCOMPLETE) {
+                if (!warrior->IsAlive() && warrior->GetQuestStatus(1719) == QUEST_STATUS_INCOMPLETE)
+                {
                     Talk(SAY_TWIGGY_FLATHEAD_DOWN);
-                    pWarrior->FailQuest(1719);
+                    warrior->FailQuest(1719);
 
                     for (uint8 i = 0; i < 6; ++i) // unsummon challengers
                     {
@@ -401,11 +403,12 @@ public:
                 if (!EventGrate && EventInProgress)
                 {
                     float x, y, z;
-                    pWarrior->GetPosition(x, y, z);
+                    warrior->GetPosition(x, y, z);
 
-                    if (x >= -1684 && x <= -1674 && y >= -4334 && y <= -4324) {
-                        pWarrior->AreaExploredOrEventHappens(1719);
-                        Talk(SAY_TWIGGY_FLATHEAD_BEGIN, pWarrior->GetGUID());
+                    if (x >= -1684 && x <= -1674 && y >= -4334 && y <= -4324)
+                    {
+                        warrior->AreaExploredOrEventHappens(1719);
+                        Talk(SAY_TWIGGY_FLATHEAD_BEGIN, warrior->GetGUID());
 
                         for (uint8 i = 0; i < 6; ++i)
                         {
@@ -447,19 +450,20 @@ public:
                         if (Wave < 6 && AffrayChallenger[Wave] && !EventBigWill)
                         {
                             Talk(SAY_TWIGGY_FLATHEAD_FRAY);
-                            Creature* creature = Unit::GetCreature((*me), AffrayChallenger[Wave]);
+                            Creature* creature = ObjectAccessor::GetCreature(*me, AffrayChallenger[Wave]);
                             if (creature && (creature->IsAlive()))
                             {
                                 creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                                 creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                                 creature->HandleEmoteCommand(EMOTE_ONESHOT_ROAR);
                                 creature->setFaction(14);
-                                creature->AI()->AttackStart(pWarrior);
+                                creature->AI()->AttackStart(warrior);
                                 ++Wave;
                                 WaveTimer = 20000;
                             }
                         }
-                        else if (Wave >= 6 && !EventBigWill) {
+                        else if (Wave >= 6 && !EventBigWill)
+                        {
                             if (Creature* creature = me->SummonCreature(NPC_BIG_WILL, -1722, -4341, 6.12f, 6.26f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 480000))
                             {
                                 BigWill = creature->GetGUID();
@@ -473,7 +477,7 @@ public:
                         }
                         else if (Wave >= 6 && EventBigWill && BigWill)
                         {
-                            Creature* creature = Unit::GetCreature((*me), BigWill);
+                            Creature* creature = ObjectAccessor::GetCreature(*me, BigWill);
                             if (!creature || !creature->IsAlive())
                             {
                                 Talk(SAY_TWIGGY_FLATHEAD_OVER);