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

7 files changed, 36 insertions, 36 deletions

diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
index 50179d138ae..4301d666c76 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
@@ -352,7 +352,7 @@ class npc_snobold_vassal : public CreatureScript
 
             void JustDied(Unit* /*killer*/) OVERRIDE
             {
-                if (Unit* target = Unit::GetPlayer(*me, _targetGUID))
+                if (Unit* target = ObjectAccessor::GetPlayer(*me, _targetGUID))
                     if (target->IsAlive())
                         target->RemoveAurasDueToSpell(SPELL_SNOBOLLED);
                 if (_instance)
@@ -379,7 +379,7 @@ class npc_snobold_vassal : public CreatureScript
                 if (!UpdateVictim() || _targetDied)
                     return;
 
-                if (Unit* target = Unit::GetPlayer(*me, _targetGUID))
+                if (Unit* target = ObjectAccessor::GetPlayer(*me, _targetGUID))
                 {
                     if (!target->IsAlive())
                     {
@@ -907,7 +907,7 @@ class boss_icehowl : public CreatureScript
                             else
                             {
                                 // Landed from Hop backwards (start trample)
-                                if (Unit::GetPlayer(*me, _trampleTargetGUID))
+                                if (ObjectAccessor::GetPlayer(*me, _trampleTargetGUID))
                                     _stage = 4;
                                 else
                                     _stage = 6;
@@ -1046,7 +1046,7 @@ class boss_icehowl : public CreatureScript
                             {
                                 case EVENT_TRAMPLE:
                                 {
-                                    if (Unit* target = Unit::GetPlayer(*me, _trampleTargetGUID))
+                                    if (Unit* target = ObjectAccessor::GetPlayer(*me, _trampleTargetGUID))
                                     {
                                         me->StopMoving();
                                         me->AttackStop();
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
index 9024000f385..a77b21a900b 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
@@ -283,6 +283,18 @@ public:
 
         SummonList spawns; // adds spawn by the trigger. kept in separated list (i.e. not in summons)
 
+        void ResetPlayerScale()
+        {
+            std::map<uint64, float>::const_iterator itr;
+            for (itr = chained.begin(); itr != chained.end(); ++itr)
+            {
+                if (Player* charmed = ObjectAccessor::GetPlayer(*me, itr->first))
+                    charmed->SetObjectScale(itr->second);
+            }
+
+            chained.clear();
+        }
+
         void Reset() OVERRIDE
         {
             _Reset();
@@ -292,14 +304,8 @@ public:
 
             me->setFaction(35);
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_NOT_SELECTABLE);
-            std::map<uint64, float>::const_iterator itr;
-            for (itr = chained.begin(); itr != chained.end(); ++itr)
-            {
-                if (Player* charmed = Unit::GetPlayer(*me, (*itr).first))
-                    charmed->SetObjectScale((*itr).second);
-            }
 
-            chained.clear();
+            ResetPlayerScale();
             spawns.DespawnAll();
 
             FindGameObjects();
@@ -340,13 +346,7 @@ public:
             _JustDied();
             Talk(SAY_DEATH);
 
-            std::map<uint64, float>::const_iterator itr;
-            for (itr = chained.begin(); itr != chained.end(); ++itr)
-            {
-                if (Player* player = Unit::GetPlayer(*me, (*itr).first))
-                    player->SetObjectScale((*itr).second);
-            }
-            chained.clear();
+            ResetPlayerScale();
         }
 
         void EnterCombat(Unit* /*who*/) OVERRIDE
@@ -523,11 +523,11 @@ public:
                             std::map<uint64, float>::iterator itr;
                             for (itr = chained.begin(); itr != chained.end();)
                             {
-                                if (Unit* player = Unit::GetPlayer(*me, (*itr).first))
+                                if (Unit* player = ObjectAccessor::GetPlayer(*me, itr->first))
                                 {
                                     if (!player->IsCharmed())
                                     {
-                                        player->SetObjectScale((*itr).second);
+                                        player->SetObjectScale(itr->second);
                                         std::map<uint64, float>::iterator next = itr;
                                         ++next;
                                         chained.erase(itr);
diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp
index 6d2a48910fe..da8511a98d5 100644
--- a/src/server/scripts/Northrend/zone_borean_tundra.cpp
+++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp
@@ -142,7 +142,7 @@ public:
                         break;
                     case 7:
                         DoCast(me, SPELL_EXPLODE_CART, true);
-                        if (Player* caster = Unit::GetPlayer(*me, casterGuid))
+                        if (Player* caster = ObjectAccessor::GetPlayer(*me, casterGuid))
                             caster->KilledMonster(me->GetCreatureTemplate(), me->GetGUID());
                         phaseTimer = 5000;
                         phase = 8;
@@ -857,7 +857,7 @@ public:
             {
                 if (me->IsWithinDistInMap(who, INTERACTION_DISTANCE))
                 {
-                    if (Player* pHarpooner = Unit::GetPlayer(*me, HarpoonerGUID))
+                    if (Player* pHarpooner = ObjectAccessor::GetPlayer(*me, HarpoonerGUID))
                     {
                         pHarpooner->KilledMonsterCredit(26175, 0);
                         pHarpooner->RemoveAura(SPELL_DRAKE_HATCHLING_SUBDUED);
@@ -873,7 +873,7 @@ public:
         {
             if (WithRedDragonBlood && HarpoonerGUID && !me->HasAura(SPELL_RED_DRAGONBLOOD))
             {
-                if (Player* pHarpooner = Unit::GetPlayer(*me, HarpoonerGUID))
+                if (Player* pHarpooner = ObjectAccessor::GetPlayer(*me, HarpoonerGUID))
                 {
                     EnterEvadeMode();
                     StartFollow(pHarpooner, 35, NULL);
@@ -1718,7 +1718,7 @@ public:
 
         void GotStinged(uint64 casterGUID)
         {
-            if (Player* caster = Player::GetPlayer(*me, casterGUID))
+            if (Player* caster = ObjectAccessor::GetPlayer(*me, casterGUID))
             {
                 uint32 step = caster->GetAuraCount(SPELL_NEURAL_NEEDLE) + 1;
                 switch (step)
@@ -2378,7 +2378,7 @@ public:
         {
             me->StopMoving();
             me->SetUInt32Value(UNIT_NPC_FLAGS, 0);
-            if (Player* player = me->GetPlayer(*me, uiPlayerGUID))
+            if (Player* player = ObjectAccessor::GetPlayer(*me, uiPlayerGUID))
                 me->SetFacingToObject(player);
             uiEventTimer = 3000;
             uiEventPhase = 1;
@@ -2392,7 +2392,7 @@ public:
         void AttackPlayer()
         {
             me->setFaction(14);
-            if (Player* player = me->GetPlayer(*me, uiPlayerGUID))
+            if (Player* player = ObjectAccessor::GetPlayer(*me, uiPlayerGUID))
                 me->AI()->AttackStart(player);
         }
 
@@ -2428,7 +2428,7 @@ public:
                         {
                             case NPC_SALTY_JOHN_THORPE:
                                 Talk(SAY_HIDDEN_CULTIST_4);
-                                if (Player* player = me->GetPlayer(*me, uiPlayerGUID))
+                                if (Player* player = ObjectAccessor::GetPlayer(*me, uiPlayerGUID))
                                     me->SetFacingToObject(player);
                                 uiEventTimer = 3000;
                                 uiEventPhase = 3;
diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp
index 9b68b37507b..1a080824136 100644
--- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp
+++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp
@@ -638,7 +638,7 @@ public:
                 switch (eventId)
                 {
                     case EVENT_STRAGGLER_1:
-                        if (Player* player = Unit::GetPlayer(*me, _playerGUID))
+                        if (Player* player = ObjectAccessor::GetPlayer(*me, _playerGUID))
                              DoCast(player, SPELL_VENTURE_STRAGGLER_CREDIT);
                          me->GetMotionMaster()->MovePoint(0, me->GetPositionX()-7, me->GetPositionY()+7, me->GetPositionZ());
                          _events.ScheduleEvent(EVENT_STRAGGLER_2, 2500);
diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp
index 15273088940..4626ffabd79 100644
--- a/src/server/scripts/Northrend/zone_howling_fjord.cpp
+++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp
@@ -338,7 +338,7 @@ public:
 
         void JustSummoned(Creature* summon) OVERRIDE
         {
-            if (Player* player = me->GetPlayer(*me, uiPlayerGUID))
+            if (Player* player = ObjectAccessor::GetPlayer(*me, uiPlayerGUID))
             {
                 if (player->IsAlive())
                 {
diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp
index c1bca1dae76..0178a9056f2 100644
--- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp
+++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp
@@ -540,8 +540,8 @@ public:
         {
             if (timer <= diff)
             {
-                Player* player = Player::GetPlayer(*me, playerGUID);
-                Creature* orphan = Creature::GetCreature(*me, orphanGUID);
+                Player* player = ObjectAccessor::GetPlayer(*me, playerGUID);
+                Creature* orphan = ObjectAccessor::GetCreature(*me, orphanGUID);
 
                 if (!orphan || !player)
                 {
diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp
index 7281c8a5b1e..c115c07c5b8 100644
--- a/src/server/scripts/Northrend/zone_zuldrak.cpp
+++ b/src/server/scripts/Northrend/zone_zuldrak.cpp
@@ -341,7 +341,7 @@ public:
 
             if (uiPhase)
             {
-                Player* player = me->GetPlayer(*me, _playerGUID);
+                Player* player = ObjectAccessor::GetPlayer(*me, _playerGUID);
 
                 if (uiTimer <= diff)
                 {
@@ -1502,7 +1502,7 @@ public:
                             _events.ScheduleEvent(EVENT_TURN_TO_POT, urand(25000, 41000));
                             break;
                         case EVENT_EASY_123:
-                            if (Player* player = Unit::GetPlayer(*me, _playerGUID))
+                            if (Player* player = ObjectAccessor::GetPlayer(*me, _playerGUID))
                             {
                                 Talk(SAY_EASY_123, _playerGUID);
                                 DoCast(player, SPELL_RANDOM_INGREDIENT_EASY_AURA);
@@ -1510,7 +1510,7 @@ public:
                             }
                             break;
                         case EVENT_MEDIUM_4:
-                            if (Player* player = Unit::GetPlayer(*me, _playerGUID))
+                            if (Player* player = ObjectAccessor::GetPlayer(*me, _playerGUID))
                             {
                                 Talk(SAY_MEDIUM_4, _playerGUID);
                                 DoCast(player, SPELL_RANDOM_INGREDIENT_MEDIUM_AURA);
@@ -1518,7 +1518,7 @@ public:
                             }
                             break;
                         case EVENT_MEDIUM_5:
-                            if (Player* player = Unit::GetPlayer(*me, _playerGUID))
+                            if (Player* player = ObjectAccessor::GetPlayer(*me, _playerGUID))
                             {
                                 Talk(SAY_MEDIUM_5, _playerGUID);
                                 DoCast(player, SPELL_RANDOM_INGREDIENT_MEDIUM_AURA);
@@ -1526,7 +1526,7 @@ public:
                             }
                             break;
                         case EVENT_HARD_6:
-                            if (Player* player = Unit::GetPlayer(*me, _playerGUID))
+                            if (Player* player = ObjectAccessor::GetPlayer(*me, _playerGUID))
                             {
                                 Talk(SAY_HARD_6, _playerGUID);
                                 DoCast(player, SPELL_RANDOM_INGREDIENT_HARD_AURA);