*Thread safe player searcher in scripts.

--HG--
branch : trunk
This commit is contained in:
QAston
2010-07-30 15:51:07 +02:00
parent 9bda35c7df
commit d666ba26c1
32 changed files with 69 additions and 66 deletions
@@ -138,7 +138,7 @@ struct npc_unworthy_initiateAI : public ScriptedAI
wait_timer = 5000;
me->CastSpell(me, SPELL_DK_INITIATE_VISUAL, true);
if (Player* starter = Unit::GetPlayer(playerGUID))
if (Player* starter = Unit::GetPlayer(*me, playerGUID))
DoScriptText(say_event_attack[rand()%9], me, starter);
phase = PHASE_TO_ATTACK;
@@ -246,7 +246,7 @@ void npc_unworthy_initiateAI::UpdateAI(const uint32 diff)
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
phase = PHASE_ATTACKING;
if (Player *pTarget = Unit::GetPlayer(playerGUID))
if (Player *pTarget = Unit::GetPlayer(*me, playerGUID))
me->AI()->AttackStart(pTarget);
wait_timer = 0;
}
@@ -92,7 +92,7 @@ struct npc_crusade_persuadedAI : public ScriptedAI
{
if (uiSpeech_timer <= diff)
{
Player* pPlayer = Unit::GetPlayer(uiPlayerGUID);
Player* pPlayer = Unit::GetPlayer(*me, uiPlayerGUID);
if (!pPlayer)
{
EnterEvadeMode();
@@ -634,7 +634,7 @@ struct npc_a_special_surpriseAI : public ScriptedAI
{
if (ExecuteSpeech_Timer <= diff)
{
Player* pPlayer = Unit::GetPlayer(PlayerGUID);
Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
if (!pPlayer)
{
@@ -383,7 +383,7 @@ struct npc_muru_portalAI : public Scripted_NoMovementAI
void JustSummoned(Creature* summoned)
{
if (pInstance)
if (Player* Target = Unit::GetPlayer(pInstance->GetData64(DATA_PLAYER_GUID)))
if (Player* Target = Unit::GetPlayer(*me, pInstance->GetData64(DATA_PLAYER_GUID)))
summoned->AI()->AttackStart(Target);
Summons.Summon(summoned);
@@ -115,7 +115,7 @@ struct npc_zulaman_hostageAI : public ScriptedAI
void EnterCombat(Unit * /*who*/) {}
void JustDied(Unit* /*who*/)
{
Player* pPlayer = Unit::GetPlayer(PlayerGUID);
Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
if (pPlayer) pPlayer->SendLoot(me->GetGUID(), LOOT_CORPSE);
}
void UpdateAI(const uint32 /*diff*/)
@@ -524,14 +524,14 @@ struct npc_apprentice_mirvedaAI : public ScriptedAI
void JustDied(Unit* /*killer*/)
{
if (PlayerGUID)
if (Player* pPlayer = Unit::GetPlayer(PlayerGUID))
if (Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID))
CAST_PLR(pPlayer)->FailQuest(QUEST_UNEXPECTED_RESULT);
}
void UpdateAI(const uint32 /*diff*/)
{
if (KillCount >= 3 && PlayerGUID)
if (Player* pPlayer = Unit::GetPlayer(PlayerGUID))
if (Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID))
CAST_PLR(pPlayer)->CompleteQuest(QUEST_UNEXPECTED_RESULT);
if (Summon)
@@ -625,7 +625,7 @@ struct npc_infused_crystalAI : public Scripted_NoMovementAI
void JustDied(Unit* /*killer*/)
{
if (PlayerGUID && !Completed)
if (Player* pPlayer = Unit::GetPlayer(PlayerGUID))
if (Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID))
CAST_PLR(pPlayer)->FailQuest(QUEST_POWERING_OUR_DEFENSES);
}
@@ -636,7 +636,7 @@ struct npc_infused_crystalAI : public Scripted_NoMovementAI
DoScriptText(EMOTE, me);
Completed = true;
if (PlayerGUID)
if (Player* pPlayer = Unit::GetPlayer(PlayerGUID))
if (Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID))
CAST_PLR(pPlayer)->CompleteQuest(QUEST_POWERING_OUR_DEFENSES);
me->DealDamage(me,me->GetHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
@@ -255,7 +255,7 @@ struct pyrewood_ambushAI : public ScriptedAI
Unit *pTarget = NULL;
if (PlayerGUID)
{
pPlayer = Unit::GetPlayer(PlayerGUID);
pPlayer = Unit::GetPlayer(*me, PlayerGUID);
if (pPlayer)
pTarget = RAND((Unit*)me, (Unit*)pPlayer);
} else
@@ -273,7 +273,7 @@ struct pyrewood_ambushAI : public ScriptedAI
void JustDied(Unit * /*pKiller*/)
{
if (PlayerGUID)
if (Player *pPlayer = Unit::GetPlayer(PlayerGUID))
if (Player *pPlayer = Unit::GetPlayer(*me, PlayerGUID))
if (pPlayer->GetQuestStatus(QUEST_PYREWOOD_AMBUSH) == QUEST_STATUS_INCOMPLETE)
pPlayer->FailQuest(QUEST_PYREWOOD_AMBUSH);
}
@@ -326,7 +326,7 @@ struct pyrewood_ambushAI : public ScriptedAI
case 5: //end
if (PlayerGUID)
{
if (Player *pPlayer = Unit::GetPlayer(PlayerGUID))
if (Player *pPlayer = Unit::GetPlayer(*me, PlayerGUID))
{
me->MonsterSay(NPCSAY_END, LANG_UNIVERSAL, 0); //not blizzlike
pPlayer->GroupEventHappens(QUEST_PYREWOOD_AMBUSH, me);
@@ -109,7 +109,7 @@ struct npc_calvin_montagueAI : public ScriptedAI
++m_uiPhase;
break;
case 2:
if (Player *pPlayer = Unit::GetPlayer(m_uiPlayerGUID))
if (Player *pPlayer = Unit::GetPlayer(*me, m_uiPlayerGUID))
pPlayer->AreaExploredOrEventHappens(QUEST_590);
DoCast(me, SPELL_DRINK, true);