diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-21 19:23:32 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-10-21 19:23:32 +0200 |
| commit | 9cc7044546eaaaf4fd7a999c5e074ad0ea3d47ef (patch) | |
| tree | e40c2f50a9b5b11620ee607103f0352521bdf54f /src/server/scripts/Events | |
| parent | 1bea52fd4649b6a1761aa157f9e74f01e19872e7 (diff) | |
Core/Entities: First batch of removing implicit conversions of ObjectGuid to uint64
Diffstat (limited to 'src/server/scripts/Events')
| -rw-r--r-- | src/server/scripts/Events/childrens_week.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp index 6e95b9351fd..37dd666cce0 100644 --- a/src/server/scripts/Events/childrens_week.cpp +++ b/src/server/scripts/Events/childrens_week.cpp @@ -960,7 +960,7 @@ class at_bring_your_orphan_to : public AreaTriggerScript break; } - if (questId && orphanId && getOrphanGUID(player, orphanId) && player->GetQuestStatus(questId) == QUEST_STATUS_INCOMPLETE) + if (questId && orphanId && !getOrphanGUID(player, orphanId).IsEmpty() && player->GetQuestStatus(questId) == QUEST_STATUS_INCOMPLETE) player->AreaExploredOrEventHappens(questId); return true; @@ -1021,7 +1021,7 @@ class npc_cw_area_trigger : public CreatureScript orphanId = ORPHAN_BLOOD_ELF; break; case NPC_SILVERMOON_01_CW_TRIGGER: - if (player->GetQuestStatus(QUEST_NOW_WHEN_I_GROW_UP) == QUEST_STATUS_INCOMPLETE && getOrphanGUID(player, ORPHAN_BLOOD_ELF)) + if (player->GetQuestStatus(QUEST_NOW_WHEN_I_GROW_UP) == QUEST_STATUS_INCOMPLETE && !getOrphanGUID(player, ORPHAN_BLOOD_ELF).IsEmpty()) { player->AreaExploredOrEventHappens(QUEST_NOW_WHEN_I_GROW_UP); if (player->GetQuestStatus(QUEST_NOW_WHEN_I_GROW_UP) == QUEST_STATUS_COMPLETE) @@ -1051,7 +1051,7 @@ class npc_cw_area_trigger : public CreatureScript } break; } - if (questId && orphanId && getOrphanGUID(player, orphanId) && player->GetQuestStatus(questId) == QUEST_STATUS_INCOMPLETE) + if (questId && orphanId && !getOrphanGUID(player, orphanId).IsEmpty() && player->GetQuestStatus(questId) == QUEST_STATUS_INCOMPLETE) player->AreaExploredOrEventHappens(questId); } } |