*Thread safe player searcher in scripts.

--HG--
branch : trunk

6 files changed, 20 insertions, 20 deletions

diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
index 9cdab2399a7..9e07aa06f45 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
@@ -123,7 +123,7 @@ struct boss_omor_the_unscarredAI : public ScriptedAI
         {
             if (ShadowWhip_Timer <= diff)
             {
-                if (Player* temp = Unit::GetPlayer(PlayerGUID))
+                if (Player* temp = Unit::GetPlayer(*me, PlayerGUID))
                 {
                     //if unit dosen't have this flag, then no pulling back (script will attempt cast, even if orbital strike was resisted)
                     if (temp->HasUnitMovementFlag(MOVEMENTFLAG_FALLING))
diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/blades_edge_mountains.cpp
index 6744045b896..b07c637d521 100644
--- a/src/server/scripts/Outland/blades_edge_mountains.cpp
+++ b/src/server/scripts/Outland/blades_edge_mountains.cpp
@@ -446,7 +446,7 @@ struct npc_ogre_bruteAI : public ScriptedAI
 
     void MovementInform(uint32 /*type*/, uint32 id)
     {
-        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
         if (id == 1)
         {
             GameObject* Keg = me->FindNearestGameObject(GO_KEG, 20);
diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp
index c2d76b0e9bb..1dc5c430636 100644
--- a/src/server/scripts/Outland/nagrand.cpp
+++ b/src/server/scripts/Outland/nagrand.cpp
@@ -779,7 +779,7 @@ struct mob_sparrowhawkAI : public ScriptedAI
                 if (fleeing && me->GetMotionMaster()->GetCurrentMovementGeneratorType() != FLEEING_MOTION_TYPE)
                     fleeing = false;
 
-                Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+                Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
                 if (pPlayer && me->IsWithinDistInMap(pPlayer, 30))
                 {
                     if (!fleeing)
diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp
index 05481f84aa3..5a8f02186af 100644
--- a/src/server/scripts/Outland/netherstorm.cpp
+++ b/src/server/scripts/Outland/netherstorm.cpp
@@ -401,7 +401,7 @@ struct npc_commander_dawnforgeAI : public ScriptedAI
     {
         Creature *ardonis = Unit::GetCreature(*me,ardonisGUID);
         Creature *pathaleon = Unit::GetCreature(*me,pathaleonGUID);
-        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
 
         if (!ardonis || !pathaleon || !pPlayer)
             return;
@@ -427,7 +427,7 @@ struct npc_commander_dawnforgeAI : public ScriptedAI
     {
         if (Unit *ardonis = Unit::GetUnit(*me,ardonisGUID))
         {
-            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+            Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
 
             if (!pPlayer)
                 return;
@@ -484,7 +484,7 @@ struct npc_commander_dawnforgeAI : public ScriptedAI
 
         Unit *ardonis = Unit::GetUnit(*me,ardonisGUID);
         Unit *pathaleon = Unit::GetUnit(*me,pathaleonGUID);
-        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
 
         if (!ardonis || !pPlayer)
         {
@@ -767,7 +767,7 @@ struct mob_phase_hunterAI : public ScriptedAI
                 ManaBurnTimer = 3500;
         } else ManaBurnTimer -= diff;
 
-        if (Player *pPlayer = Unit::GetPlayer(PlayerGUID)) // start: support for quest 10190
+        if (Player *pPlayer = Unit::GetPlayer(*me, PlayerGUID)) // start: support for quest 10190
         {
             if (!Weak && me->GetHealth() < (me->GetMaxHealth() / 100 * WeakPercent)
                 && pPlayer->GetQuestStatus(QUEST_RECHARGING_THE_BATTERIES) == QUEST_STATUS_INCOMPLETE)
diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp
index b85959b34c8..e54d0a734db 100644
--- a/src/server/scripts/Outland/shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/shadowmoon_valley.cpp
@@ -139,7 +139,7 @@ struct mob_mature_netherwing_drakeAI : public ScriptedAI
                     DoCast(me, SPELL_JUST_EATEN);
                     DoScriptText(SAY_JUST_EATEN, me);
 
-                    if (Player* pPlr = Unit::GetPlayer(uiPlayerGUID))
+                    if (Player* pPlr = Unit::GetPlayer(*me, uiPlayerGUID))
                     {
                         pPlr->KilledMonsterCredit(NPC_EVENT_PINGER, me->GetGUID());
 
@@ -270,7 +270,7 @@ struct mob_enslaved_netherwing_drakeAI : public ScriptedAI
                 Tapped = false;
                 if (PlayerGUID)
                 {
-                    Player* plr = Unit::GetPlayer(PlayerGUID);
+                    Player* plr = Unit::GetPlayer(*me, PlayerGUID);
                     if (plr && plr->GetQuestStatus(10854) == QUEST_STATUS_INCOMPLETE)
                     {
                         DoCast(plr, SPELL_FORCE_OF_NELTHARAKU, true);
@@ -364,7 +364,7 @@ struct mob_dragonmaw_peonAI : public ScriptedAI
         {
             if (PlayerGUID)
             {
-                Player* plr = Unit::GetPlayer(PlayerGUID);
+                Player* plr = Unit::GetPlayer(*me, PlayerGUID);
                 if (plr && plr->GetQuestStatus(11020) == QUEST_STATUS_INCOMPLETE)
                     plr->KilledMonsterCredit(23209, me->GetGUID());
             }
@@ -709,7 +709,7 @@ struct npc_overlord_morghorAI : public ScriptedAI
         }
         if (PlayerGUID)
         {
-            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+            Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
             if (pPlayer)
                 DoScriptText(OVERLORD_SAY_1, me, pPlayer);
         }
@@ -1281,7 +1281,7 @@ struct mob_torloth_the_magnificentAI : public ScriptedAI
             me->RemoveFlag(UNIT_FIELD_BYTES_1,8);
             break;
         case 5:
-            if (Player* AggroTarget = (Unit::GetPlayer(AggroTargetGUID)))
+            if (Player* AggroTarget = (Unit::GetPlayer(*me, AggroTargetGUID)))
             {
                 me->SetUInt64Value(UNIT_FIELD_TARGET, AggroTarget->GetGUID());
                 me->AddThreat(AggroTarget, 1);
@@ -1289,7 +1289,7 @@ struct mob_torloth_the_magnificentAI : public ScriptedAI
             }
             break;
         case 6:
-            if (Player* AggroTarget = (Unit::GetPlayer(AggroTargetGUID)))
+            if (Player* AggroTarget = (Unit::GetPlayer(*me, AggroTargetGUID)))
             {
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                 me->clearUnitState(UNIT_STAT_ROOT);
@@ -1458,7 +1458,7 @@ struct npc_lord_illidan_stormrageAI : public ScriptedAI
                 {
                     if (PlayerGUID)
                     {
-                        if (Player* pTarget = Unit::GetPlayer(PlayerGUID))
+                        if (Player* pTarget = Unit::GetPlayer(*me, PlayerGUID))
                         {
                             float x, y, z;
                             pTarget->GetPosition(x,y,z);
@@ -1483,7 +1483,7 @@ struct npc_lord_illidan_stormrageAI : public ScriptedAI
 
     void CheckEventFail()
     {
-        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
 
         if (!pPlayer)
             return;
@@ -1500,7 +1500,7 @@ struct npc_lord_illidan_stormrageAI : public ScriptedAI
 
             for (Group::member_citerator itr = members.begin(); itr!= members.end(); ++itr)
             {
-                GroupMember = (Unit::GetPlayer(itr->guid));
+                GroupMember = (Unit::GetPlayer(*me, itr->guid));
                 if (!GroupMember)
                     continue;
                 if (!GroupMember->IsWithinDistInMap(me, EVENT_AREA_RADIUS) && GroupMember->GetQuestStatus(QUEST_BATTLE_OF_THE_CRIMSON_WATCH) == QUEST_STATUS_INCOMPLETE)
@@ -1526,7 +1526,7 @@ struct npc_lord_illidan_stormrageAI : public ScriptedAI
             {
                 for (Group::member_citerator itr = members.begin(); itr!= members.end(); ++itr)
                 {
-                    GroupMember = Unit::GetPlayer(itr->guid);
+                    GroupMember = Unit::GetPlayer(*me, itr->guid);
 
                     if (GroupMember && GroupMember->GetQuestStatus(QUEST_BATTLE_OF_THE_CRIMSON_WATCH) == QUEST_STATUS_INCOMPLETE)
                     {
diff --git a/src/server/scripts/Outland/shattrath_city.cpp b/src/server/scripts/Outland/shattrath_city.cpp
index 74105af6428..419cb387e8b 100644
--- a/src/server/scripts/Outland/shattrath_city.cpp
+++ b/src/server/scripts/Outland/shattrath_city.cpp
@@ -404,7 +404,7 @@ struct npc_dirty_larryAI : public ScriptedAI
 
     uint32 NextStep(uint32 Step)
     {
-        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
 
         switch(Step)
         {
@@ -438,7 +438,7 @@ struct npc_dirty_larryAI : public ScriptedAI
 
         if (Attack)
         {
-            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+            Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
             me->setFaction(14);
             me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
             if (pPlayer)
@@ -492,7 +492,7 @@ struct npc_dirty_larryAI : public ScriptedAI
             me->DeleteThreatList();
             me->CombatStop();
             me->GetMotionMaster()->MoveTargetedHome();
-            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+            Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
             if (pPlayer)
                 CAST_PLR(pPlayer)->GroupEventHappens(QUEST_WBI, me);
         }