diff options
| author | SnapperRy <snapperryen@gmail.com> | 2016-10-29 16:49:10 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-11-11 20:05:40 +0100 |
| commit | ece0c955fcffa9127d987dc782780872d7a52fce (patch) | |
| tree | 6fb0b64a55a466e3678c7d672f3ed2051427e23e /src | |
| parent | afdc4dd6b317a058244fbf671212bca028e4df8f (diff) | |
Codestyle.
(cherry picked from commit ec023c3032b55bcfdc83d458ac79204bb25c7aed)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_dragonblight.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp index 4478cd83a48..d51f06689e4 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp @@ -577,7 +577,7 @@ public: bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/, bool /*entered*/) override { - if (player && player->IsAlive()) + if (player->IsAlive()) if (InstanceScript* instance = player->GetInstanceScript()) if (Creature* infiltrator = ObjectAccessor::GetCreature(*player, instance->GetGuidData(DATA_SCARSHIELD_INFILTRATOR))) { diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index c186aab88ee..fed1ad68204 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -717,8 +717,8 @@ public: bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/, bool entered) override { - if (player && player->IsAlive() && entered) - if (const Quest* quest = sObjectMgr->GetQuestTemplate(QUEST_MESSAGE_FROM_THE_WEST)) + if (player->IsAlive() && entered) + if (Quest const* quest = sObjectMgr->GetQuestTemplate(QUEST_MESSAGE_FROM_THE_WEST)) if (player->CanTakeQuest(quest, false)) if (Creature* creature = player->FindNearestCreature(NPC_MESSENGER_TORVUS, 50.0f, true)) creature->AI()->Talk(TALK_0, player); |