aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSnapperRy <snapperryen@gmail.com>2016-10-29 16:49:10 +0200
committerSnapperRy <snapperryen@gmail.com>2016-10-29 16:49:10 +0200
commitec023c3032b55bcfdc83d458ac79204bb25c7aed (patch)
tree53375d7ce0d97f470c782c06c4020257ec379375 /src
parente55641f37862434af36b2ea0aea9bf8c79773426 (diff)
Codestyle.
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp2
-rw-r--r--src/server/scripts/Northrend/zone_dragonblight.cpp4
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 a43e2ee37dd..89617a9f4ef 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
@@ -578,7 +578,7 @@ public:
bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) 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 52817c9bb29..cb5a7462000 100644
--- a/src/server/scripts/Northrend/zone_dragonblight.cpp
+++ b/src/server/scripts/Northrend/zone_dragonblight.cpp
@@ -716,8 +716,8 @@ public:
bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) override
{
- if (player && player->IsAlive())
- if (const Quest* quest = sObjectMgr->GetQuestTemplate(QUEST_MESSAGE_FROM_THE_WEST))
+ if (player->IsAlive())
+ 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);