*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
@@ -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);