*Thread safe player searcher in scripts.

--HG--
branch : trunk

5 files changed, 10 insertions, 10 deletions

diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
index 13d65619a13..dfe07de6e00 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
@@ -171,7 +171,7 @@ struct boss_devourer_of_soulsAI : public ScriptedAI
     {
         if (uiMirroredSoulTarget && me->HasAura(SPELL_MIRRORED_SOUL))
         {
-            if (Player *pPlayer = Unit::GetPlayer(uiMirroredSoulTarget))
+            if (Player *pPlayer = Unit::GetPlayer(*me, uiMirroredSoulTarget))
             {
                 if (Aura *pAura = pPlayer->GetAura(SPELL_MIRRORED_SOUL))
                 {
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
index 5188ab14d2f..196d0771b97 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
@@ -286,7 +286,7 @@ struct boss_kelthuzadAI : public BossAI
         std::map<uint64, float>::const_iterator itr;
         for (itr = chained.begin(); itr != chained.end(); ++itr)
         {
-            if (Player* charmed = Unit::GetPlayer((*itr).first))
+            if (Player* charmed = Unit::GetPlayer(*me, (*itr).first))
                 charmed->SetFloatValue(OBJECT_FIELD_SCALE_X, (*itr).second);
         }
 
@@ -331,7 +331,7 @@ struct boss_kelthuzadAI : public BossAI
         std::map<uint64, float>::const_iterator itr;
         for (itr = chained.begin(); itr != chained.end(); ++itr)
         {
-            if (Player* pPlayer = Unit::GetPlayer((*itr).first))
+            if (Player* pPlayer = Unit::GetPlayer(*me, (*itr).first))
                 pPlayer->SetFloatValue(OBJECT_FIELD_SCALE_X, (*itr).second);
         }
         chained.clear();
@@ -511,7 +511,7 @@ struct boss_kelthuzadAI : public BossAI
                         std::map<uint64, float>::iterator itr;
                         for (itr = chained.begin(); itr != chained.end();)
                         {
-                            if (Unit* player = Unit::GetPlayer((*itr).first))
+                            if (Unit* player = Unit::GetPlayer(*me, (*itr).first))
                             {
                                 if (!player->isCharmed())
                                 {
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
index a646e6d8412..0b2ac4173e2 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
@@ -203,7 +203,7 @@ struct boss_sapphironAI : public BossAI
     {
         for (IceBlockMap::const_iterator itr = iceblocks.begin(); itr != iceblocks.end(); ++itr)
         {
-            if (Player* pPlayer = Unit::GetPlayer(itr->first))
+            if (Player* pPlayer = Unit::GetPlayer(*me, itr->first))
                 pPlayer->RemoveAura(SPELL_ICEBOLT);
             if (GameObject* pGo = GameObject::GetGameObject(*me, itr->second))
                 pGo->Delete();
diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp
index bd6f390165a..b71c03eedf2 100644
--- a/src/server/scripts/Northrend/borean_tundra.cpp
+++ b/src/server/scripts/Northrend/borean_tundra.cpp
@@ -133,7 +133,7 @@ struct npc_sinkhole_kill_creditAI : public ScriptedAI
                     break;
                 case 7:
                     DoCast(me, SPELL_EXPLODE_CART, true);
-                    if (Player *caster = Unit::GetPlayer(casterGuid))
+                    if (Player *caster = Unit::GetPlayer(*me, casterGuid))
                         caster->KilledMonster(me->GetCreatureInfo(),me->GetGUID());
                     uiPhaseTimer = 5000;
                     Phase = 8;
@@ -808,7 +808,7 @@ struct npc_nexus_drake_hatchlingAI : public FollowerAI //The spell who makes the
         {
             if (me->IsWithinDistInMap(pWho, INTERACTION_DISTANCE))
             {
-                if (Player *pHarpooner = Unit::GetPlayer(HarpoonerGUID))
+                if (Player *pHarpooner = Unit::GetPlayer(*me, HarpoonerGUID))
                 {
                     pHarpooner->KilledMonsterCredit(26175,0);
                     pHarpooner->RemoveAura(SPELL_DRAKE_HATCHLING_SUBDUED);
@@ -824,7 +824,7 @@ struct npc_nexus_drake_hatchlingAI : public FollowerAI //The spell who makes the
     {
         if (WithRedDragonBlood && HarpoonerGUID && !me->HasAura(SPELL_RED_DRAGONBLOOD))
         {
-            if (Player *pHarpooner = Unit::GetPlayer(HarpoonerGUID))
+            if (Player *pHarpooner = Unit::GetPlayer(*me, HarpoonerGUID))
             {
                 EnterEvadeMode();
                 StartFollow(pHarpooner, 35, NULL);
@@ -1640,7 +1640,7 @@ struct npc_imprisoned_beryl_sorcererAI : public ScriptedAI
             case 5:
                 if (uiStep == 5)
                 {
-                    if (Player *pCaster = Unit::GetPlayer(CasterGUID))
+                    if (Player *pCaster = Unit::GetPlayer(*me, CasterGUID))
                     {
                         DoScriptText(SAY_IMPRISIONED_BERYL_5, me);
                         pCaster->KilledMonsterCredit(25478,0);
diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp
index b1574b21f6b..2b0917922e2 100644
--- a/src/server/scripts/Northrend/zuldrak.cpp
+++ b/src/server/scripts/Northrend/zuldrak.cpp
@@ -389,7 +389,7 @@ struct npc_gurgthockAI : public ScriptedAI
 
         if (uiPhase)
         {
-            Player* pPlayer = me->GetPlayer(uiPlayerGUID);
+            Player* pPlayer = me->GetPlayer(*me, uiPlayerGUID);
 
             if (uiTimer <= uiDiff)
             {