diff options
| -rw-r--r-- | src/server/scripts/Northrend/borean_tundra.cpp | 14 | ||||
| -rw-r--r-- | src/server/scripts/Outland/hellfire_peninsula.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index a3aa60cfcdd..b44db0d2987 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -511,14 +511,14 @@ public: if (who->GetEntry() == NPC_JENNY && me->IsWithinDistInMap(who, 10.0f)) { - if (Unit* pOwner = who->GetOwner()) + if (Unit* owner = who->GetOwner()) { - if (pOwner->GetTypeId() == TYPEID_PLAYER) + if (owner->GetTypeId() == TYPEID_PLAYER) { if (who->HasAura(SPELL_CRATES_CARRIED)) { - pOwner->CastSpell(pOwner, SPELL_GIVE_JENNY_CREDIT, true); // Maybe is not working. - CAST_PLR(pOwner)->CompleteQuest(QUEST_LOADER_UP); + owner->CastSpell(owner, SPELL_GIVE_JENNY_CREDIT, true); // Maybe is not working. + CAST_PLR(owner)->CompleteQuest(QUEST_LOADER_UP); CAST_CRE(who)->DisappearAndDie(); } } @@ -2175,9 +2175,9 @@ public: { if (Unit* uOwner = me->GetOwner()) { - Player* pOwner = uOwner->ToPlayer(); - if (pOwner && pOwner->GetQuestStatus(QUEST_BURY_THOSE_COCKROACHES) == QUEST_STATUS_INCOMPLETE) - pOwner->KilledMonsterCredit(cCredit->GetEntry(), cCredit->GetGUID()); + Player* owner = uOwner->ToPlayer(); + if (owner && owner->GetQuestStatus(QUEST_BURY_THOSE_COCKROACHES) == QUEST_STATUS_INCOMPLETE) + owner->KilledMonsterCredit(cCredit->GetEntry(), cCredit->GetGUID()); } } } diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp index a9845cbeb12..430754c10d6 100644 --- a/src/server/scripts/Outland/hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/hellfire_peninsula.cpp @@ -503,8 +503,8 @@ public: pHelboar->RemoveCorpse(); DoCast(SPELL_SUMMON_POO); - if (Player* pOwner = me->GetCharmerOrOwnerPlayerOrPlayerItself()) - me->GetMotionMaster()->MoveFollow(pOwner, 0.0f, 0.0f); + if (Player* owner = me->GetCharmerOrOwnerPlayerOrPlayerItself()) + me->GetMotionMaster()->MoveFollow(owner, 0.0f, 0.0f); } } diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index f06ce89f699..91f5378e8b4 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -2103,11 +2103,11 @@ public: void DamageTaken(Unit* /*killer*/, uint32 &damage) { if (me->isSummon()) - if (Unit* pOwner = me->ToTempSummon()->GetSummoner()) + if (Unit* owner = me->ToTempSummon()->GetSummoner()) { - if (pOwner->HasAura(GLYPH_OF_SHADOWFIEND)) + if (owner->HasAura(GLYPH_OF_SHADOWFIEND)) if (damage >= me->GetHealth()) - pOwner->CastSpell(pOwner, GLYPH_OF_SHADOWFIEND_MANA, true); + owner->CastSpell(owner, GLYPH_OF_SHADOWFIEND_MANA, true); } } |