*Thread safe player searcher in scripts.

--HG--
branch : trunk

8 files changed, 15 insertions, 15 deletions

diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
index 0ab4034200d..8de6f2628b9 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
@@ -101,7 +101,7 @@ struct npc_sergeant_blyAI : public ScriptedAI
                         break;
                     case 3:
                         me->setFaction(FACTION_HOSTILE);
-                        if (Player* pTarget = Player::GetPlayer(PlayerGUID))
+                        if (Player* pTarget = Player::GetPlayer(*me, PlayerGUID))
                             AttackStart(pTarget);
 
                         if (pInstance)
diff --git a/src/server/scripts/Kalimdor/azshara.cpp b/src/server/scripts/Kalimdor/azshara.cpp
index 656730f687f..422f7fc54da 100644
--- a/src/server/scripts/Kalimdor/azshara.cpp
+++ b/src/server/scripts/Kalimdor/azshara.cpp
@@ -309,7 +309,7 @@ struct mob_rizzle_sprysprocketAI : public ScriptedAI
                     me->AI_SendMoveToPacket(3706.39, -3969.15, 35.9118, 0, 0, 0);
                 }
                 //begin swimming and summon depth charges
-                Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+                Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
                 SendText(MSG_ESCAPE_NOTICE, pPlayer);
                 DoCast(me, SPELL_PERIODIC_DEPTH_CHARGE);
                 me->SetUnitMovementFlags(MOVEMENTFLAG_HOVER | MOVEMENTFLAG_SWIMMING);
@@ -330,7 +330,7 @@ struct mob_rizzle_sprysprocketAI : public ScriptedAI
 
         if (Grenade_Timer <= diff)
         {
-            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+            Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
             if (pPlayer)
             {
                DoScriptText(SAY_RIZZLE_GRENADE, me, pPlayer);
@@ -341,7 +341,7 @@ struct mob_rizzle_sprysprocketAI : public ScriptedAI
 
         if (Check_Timer <= diff)
         {
-            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+            Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
             if (!pPlayer)
             {
                 me->ForcedDespawn();
diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
index ca35b48b970..6b0ee66e9ea 100644
--- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
@@ -125,7 +125,7 @@ struct npc_draenei_survivorAI : public ScriptedAI
             {
                 me->RemoveAurasDueToSpell(SPELL_IRRIDATION);
 
-                if (Player* pPlayer = Unit::GetPlayer(pCaster))
+                if (Player* pPlayer = Unit::GetPlayer(*me, pCaster))
                 {
                     DoScriptText(RAND(SAY_HEAL1, SAY_HEAL2, SAY_HEAL3, SAY_HEAL4), me, pPlayer);
 
diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp
index 4fe0b3a5333..75f484abc15 100644
--- a/src/server/scripts/Kalimdor/moonglade.cpp
+++ b/src/server/scripts/Kalimdor/moonglade.cpp
@@ -291,7 +291,7 @@ public:
         if (!PlayerGUID)
             return;
 
-        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
         if (pPlayer && pPlayer->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE)
         {
             pPlayer->FailQuest(10965);
@@ -302,7 +302,7 @@ public:
 
     void EnterEvadeMode()
     {
-        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
         if (pPlayer && pPlayer->isInCombat() && pPlayer->getAttackerForHelper())
         {
             AttackStart(pPlayer->getAttackerForHelper());
@@ -351,7 +351,7 @@ public:
         {
             if (checkPlayer_Timer <= diff)
             {
-                Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+                Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
                 if (pPlayer && pPlayer->isInCombat() && pPlayer->getAttackerForHelper())
                     AttackStart(pPlayer->getAttackerForHelper());
                 checkPlayer_Timer = 1000;
@@ -361,7 +361,7 @@ public:
         if (Event_onWait && Event_Timer <= diff)
         {
 
-            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+            Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
             if (!pPlayer || (pPlayer && pPlayer->GetQuestStatus(10965) == QUEST_STATUS_NONE))
             {
                 me->setDeathState(JUST_DIED);
diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/mulgore.cpp
index ff06012cbf6..0021643eb53 100644
--- a/src/server/scripts/Kalimdor/mulgore.cpp
+++ b/src/server/scripts/Kalimdor/mulgore.cpp
@@ -156,7 +156,7 @@ struct npc_kyle_frenziedAI : public ScriptedAI
                         me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USESTANDING);
                         break;
                     case 3:
-                        if (Player* pUnit = Unit::GetPlayer(uiPlayerGUID))
+                        if (Player* pUnit = Unit::GetPlayer(*me, uiPlayerGUID))
                             pUnit->TalkedToCreature(me->GetEntry(), me->GetGUID());
 
                         me->UpdateEntry(NPC_KYLE_FRIENDLY);
diff --git a/src/server/scripts/Kalimdor/orgrimmar.cpp b/src/server/scripts/Kalimdor/orgrimmar.cpp
index 5dd273d9be4..24879f9e38f 100644
--- a/src/server/scripts/Kalimdor/orgrimmar.cpp
+++ b/src/server/scripts/Kalimdor/orgrimmar.cpp
@@ -103,7 +103,7 @@ struct npc_shenthulAI : public ScriptedAI
         {
             if (Reset_Timer <= diff)
             {
-                if (Player* pPlayer = Unit::GetPlayer(PlayerGUID))
+                if (Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID))
                 {
                     if (pPlayer->GetTypeId() == TYPEID_PLAYER && pPlayer->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE)
                         pPlayer->FailQuest(QUEST_SHATTERED_SALUTE);
diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp
index 75c4e8d1158..f96c8140772 100644
--- a/src/server/scripts/Kalimdor/silithus.cpp
+++ b/src/server/scripts/Kalimdor/silithus.cpp
@@ -500,7 +500,7 @@ struct npc_anachronos_the_ancientAI : public ScriptedAI
 
     void HandleAnimation()
     {
-        Player* plr = Unit::GetPlayer(PlayerGUID);
+        Player* plr = Unit::GetPlayer(*me, PlayerGUID);
         if (!plr)
             return;
 
@@ -960,7 +960,7 @@ struct npc_anachronos_quest_triggerAI : public ScriptedAI
 
     void CheckEventFail()
     {
-        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
 
         if (!pPlayer)
             return;
@@ -977,7 +977,7 @@ struct npc_anachronos_quest_triggerAI : 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_A_PAWN_ON_THE_ETERNAL_BOARD) == QUEST_STATUS_INCOMPLETE)
diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp
index 901e3b8b923..a41e046618b 100644
--- a/src/server/scripts/Kalimdor/the_barrens.cpp
+++ b/src/server/scripts/Kalimdor/the_barrens.cpp
@@ -362,7 +362,7 @@ struct npc_twiggy_flatheadAI : public ScriptedAI
             Player* pWarrior = NULL;
 
             if (PlayerGUID)
-                pWarrior = Unit::GetPlayer(PlayerGUID);
+                pWarrior = Unit::GetPlayer(*me, PlayerGUID);
 
             if (!pWarrior)
                 return;