From a162d421ce49521974be3d74ddf09ff2cc7287f4 Mon Sep 17 00:00:00 2001 From: Keader Date: Thu, 8 Feb 2018 10:16:19 -0300 Subject: [PATCH] Core/Scripts: Fixed tabs issues introduced in 5bef3e426aea37b0e7555f146037c58e7be6352d --- .../EasternKingdoms/MagistersTerrace/boss_vexallus.cpp | 5 ----- .../EasternKingdoms/ScarletEnclave/chapter2.cpp | 2 +- src/server/scripts/Northrend/zone_howling_fjord.cpp | 6 +++--- .../BloodFurnace/boss_kelidan_the_breaker.cpp | 10 +++++----- .../HellfireRamparts/boss_vazruden_the_herald.cpp | 6 +++--- src/server/scripts/Outland/zone_shadowmoon_valley.cpp | 6 +++--- 6 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index 15e28f8e435..94cf59f5b92 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -82,11 +82,6 @@ class boss_vexallus : public CreatureScript Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) override - { - _JustDied(); - } - void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 913db196e12..193a31325db 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -549,7 +549,7 @@ public: void JustDied(Unit* killer) override { Talk(SAY_VALROTH_DEATH); - if (killer) + if (killer) killer->CastSpell(me, SPELL_SUMMON_VALROTH_REMAINS, true); } }; diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index ff8449cbd5b..b9f409f6e05 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -636,9 +636,9 @@ public: void JustDied(Unit* killer) override { - if (!killer || killer->GetTypeId() != TYPEID_PLAYER) - return; - + if (!killer || killer->GetTypeId() != TYPEID_PLAYER) + return; + Player* player = killer->ToPlayer(); if (roll_chance_i(20)) diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index 912fcfe50b3..97501805255 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -308,11 +308,11 @@ class npc_shadowmoon_channeler : public CreatureScript void JustDied(Unit* killer) override { - if (!killer) - return; - - if (Creature* Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100)) - ENSURE_AI(boss_kelidan_the_breaker::boss_kelidan_the_breakerAI, Kelidan->AI())->ChannelerDied(killer); + if (!killer) + return; + + if (Creature* Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100)) + ENSURE_AI(boss_kelidan_the_breaker::boss_kelidan_the_breakerAI, Kelidan->AI())->ChannelerDied(killer); } void UpdateAI(uint32 diff) override diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index 35f6a423a90..5f77ffe9c60 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -484,9 +484,9 @@ class npc_hellfire_sentry : public CreatureScript void JustDied(Unit* killer) override { - if (!killer) - return; - + if (!killer) + return; + if (Creature* herald = me->FindNearestCreature(NPC_VAZRUDEN_HERALD, 150)) ENSURE_AI(boss_vazruden_the_herald::boss_vazruden_the_heraldAI, herald->AI())->SentryDownBy(killer); } diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index 21710c50b0a..f3184bf7807 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -971,9 +971,9 @@ public: void JustDied(Unit* killer) override { - if (!killer) - return; - + if (!killer) + return; + switch (killer->GetTypeId()) { case TYPEID_UNIT: