*Thread safe player searcher in scripts.
--HG-- branch : trunk
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user