diff options
| author | jackpoz <giacomopoz@gmail.com> | 2017-11-12 12:44:45 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-02-06 21:41:51 +0100 |
| commit | 852c9e910886da257069dd497afa1ed990b4e8dd (patch) | |
| tree | ad88e99d31dec0e415df608984084c276a79894e /src/server/scripts | |
| parent | 388034498f853aaac3eec752a49686e01472f176 (diff) | |
Core/Misc: Fix static analysis issues
(cherry picked from commit a80c95a1c788932696fb43e69b9012a751431bac)
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 e004ebeb87d..c1feefc773c 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -490,8 +490,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 e2c60d06c66..682f43b487c 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -561,15 +561,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()) |