diff options
Diffstat (limited to 'src/server/scripts')
5 files changed, 12 insertions, 12 deletions
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index 11c48439da4..e807967f8dc 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -326,7 +326,7 @@ public: if (Creature* fetchVesp = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_VESPERON))) { - if (fetchVesp && fetchVesp->IsAlive() && !fetchVesp->GetVictim()) + if (fetchVesp->IsAlive() && !fetchVesp->GetVictim()) { _canUseWill = true; if (!fetchVesp->IsInCombat()) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index 3b997fe9516..2d270a2026e 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -227,7 +227,7 @@ public: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) { - if (target && target->IsAlive()) + if (target->IsAlive()) { DoCast(target, SPELL_HAMMER_JUSTICE); DoCast(target, SPELL_HAMMER_RIGHTEOUS); @@ -353,7 +353,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) { - if (target && target->IsAlive()) + if (target->IsAlive()) DoCast(target, SPELL_HOLY_FIRE); } if (me->HasAura(SPELL_SHIELD)) @@ -366,7 +366,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) { - if (target && target->IsAlive()) + if (target->IsAlive()) DoCast(target, SPELL_SMITE); } if (me->HasAura(SPELL_SHIELD)) @@ -459,7 +459,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - if (target && target->IsAlive()) + if (target->IsAlive()) DoCast(target, SPELL_OLD_WOUNDS); } uiOldWoundsTimer = 12000; @@ -475,7 +475,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) { - if (target && target->IsAlive()) + if (target->IsAlive()) DoCast(target, SPELL_SHADOWS_PAST); } uiShadowPastTimer = 5000; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index c64222cc61c..3ce339f7434 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -197,7 +197,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (target && target->IsAlive()) + if (target->IsAlive()) DoCast(target, SPELL_DEATH_RESPITE); } uiDeathRespiteTimer = urand(15000, 16000); @@ -225,7 +225,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (target && target->IsAlive()) + if (target->IsAlive()) DoCast(target, SPELL_DESECRATION); } uiDesecration = urand(15000, 16000); @@ -252,7 +252,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (target && target->IsAlive()) + if (target->IsAlive()) DoCast(target, SPELL_MARKED_DEATH); } uiMarkedDeathTimer = urand(5000, 7000); @@ -333,7 +333,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) { - if (target && target->IsAlive()) + if (target->IsAlive()) DoCast(target, (SPELL_LEAP)); } uiAttackTimer = 3500; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index ffbc0901f31..601aa75b335 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -1006,7 +1006,7 @@ class npc_ball_of_flame : public CreatureScript { // need to clear states now because this call is before AuraEffect is fully removed me->ClearUnitState(UNIT_STATE_CASTING | UNIT_STATE_STUNNED); - if (target && me->Attack(target, true)) + if (me->Attack(target, true)) me->GetMotionMaster()->MoveChase(target, 1.0f); } } diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 874fb45638c..eb6885f7e34 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -924,7 +924,7 @@ class spell_q9874_liquid_fire : public SpellScriptLoader { Player* caster = GetCaster()->ToPlayer(); if (Creature* target = GetHitCreature()) - if (target && !target->HasAura(SPELL_FLAMES)) + if (!target->HasAura(SPELL_FLAMES)) { caster->KilledMonsterCredit(NPC_VILLAGER_KILL_CREDIT); target->CastSpell(target, SPELL_FLAMES, true); |