diff options
| author | jackpoz <giacomopoz@gmail.com> | 2017-11-12 12:44:45 +0100 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2017-11-12 14:55:11 +0100 |
| commit | a80c95a1c788932696fb43e69b9012a751431bac (patch) | |
| tree | c6c116b1b1923e3ca72682c2fd98a3b883a1c384 /src/server/scripts | |
| parent | 9b7c73a19df66849ec829fc5a94875aa9593934d (diff) | |
Core/Misc: Fix static analysis issues
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp | 3 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp | 13 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index fcd307ada07..2cb87b96262 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -491,8 +491,7 @@ public: { if (axe->GetVictim()) ResetThreat(axe->GetVictim(), axe); - if (target) - AddThreat(target, 1000000.0f, axe); + AddThreat(target, 1000000.0f, axe); } } } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 0519b46959b..3a10b0f5619 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -563,15 +563,12 @@ public: Rebirth = true; } - if (Rebirth) + if (Death_Timer <= diff) { - if (Death_Timer <= diff) - { - me->SummonCreature(CREATURE_PHOENIX_EGG, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45000); - me->DisappearAndDie(); - Rebirth = false; - } else Death_Timer -= diff; - } + me->SummonCreature(CREATURE_PHOENIX_EGG, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45000); + me->DisappearAndDie(); + Rebirth = false; + } else Death_Timer -= diff; } if (!UpdateVictim()) |