aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeader <keader.android@gmail.com>2018-02-08 10:16:19 -0300
committerShauren <shauren.trinity@gmail.com>2021-06-19 23:33:24 +0200
commit9b7f3bff9f6759869cfccbc5da4e8959ac1d019c (patch)
tree74e6897da1a490bd53b5a2ad50df0ca21e2f0eb8
parentad5b0fa9cd6c5e6f3a0b5975c50b1bfc2a1f32de (diff)
Core/Scripts: Fixed tabs issues introduced in 5bef3e426aea37b0e7555f146037c58e7be6352d
(cherry picked from commit 31ad6358fb9088583142d108d2649d0c94b43358)
-rw-r--r--src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp5
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp2
-rw-r--r--src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp14
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp2
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp8
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp16
-rw-r--r--src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp2
-rw-r--r--src/server/scripts/Northrend/VioletHold/boss_erekem.cpp2
-rw-r--r--src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp2
-rw-r--r--src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp2
-rw-r--r--src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp2
-rw-r--r--src/server/scripts/Northrend/zone_borean_tundra.cpp16
-rw-r--r--src/server/scripts/Northrend/zone_howling_fjord.cpp6
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp10
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp6
-rw-r--r--src/server/scripts/Outland/zone_shadowmoon_valley.cpp6
16 files changed, 48 insertions, 53 deletions
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
index 58c07769dd3..6cfa9eec32f 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
@@ -83,11 +83,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 e00431dcc89..f2b59e52777 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
@@ -550,7 +550,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/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
index 156756960ea..b5b0442bb8d 100644
--- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
@@ -67,9 +67,9 @@ public:
void JustDied(Unit* killer) override
{
- if (!killer)
- return;
-
+ if (!killer)
+ return;
+
uint32 spawnCreatureID = 0;
switch (urand(0, 2))
@@ -264,10 +264,10 @@ public:
{
me->SetObjectScale(1.0f);
_events.Reset();
-
- if (!killer)
- return;
-
+
+ if (!killer)
+ return;
+
if (Creature* legoso = me->FindNearestCreature(NPC_LEGOSO, SIZE_OF_GRIDS))
{
Group* group = me->GetLootRecipientGroup();
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
index 6286c29c311..10df5692fa5 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
@@ -486,7 +486,7 @@ class npc_swarm_scarab : public CreatureScript
void JustDied(Unit* killer) override
{
- if (killer)
+ if (killer)
DoCast(killer, SPELL_TRAITOR_KING);
}
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
index f84eb9cdd19..a8bf0718f8b 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
@@ -202,10 +202,10 @@ class boss_blood_queen_lana_thel : public CreatureScript
DoCastAOE(SPELL_BLOOD_INFUSION_CREDIT, true);
CleanAuras();
-
- if (!killer)
- return;
-
+
+ if (!killer)
+ return;
+
// Blah, credit the quest
if (_creditBloodQuickening)
{
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
index ae8ca6f2f14..680f57e5954 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
@@ -367,10 +367,10 @@ class boss_lady_deathwhisper : public CreatureScript
darnavan->SetReactState(REACT_PASSIVE);
darnavan->m_Events.AddEvent(new DaranavanMoveEvent(*darnavan), darnavan->m_Events.CalculateTime(10000));
darnavan->AI()->Talk(SAY_DARNAVAN_RESCUED);
-
- if (!killer)
- return;
-
+
+ if (!killer)
+ return;
+
if (Player* owner = killer->GetCharmerOrOwnerPlayerOrPlayerItself())
{
if (Group* group = owner->GetGroup())
@@ -893,10 +893,10 @@ class npc_darnavan : public CreatureScript
void JustDied(Unit* killer) override
{
_events.Reset();
-
- if (!killer)
- return;
-
+
+ if (!killer)
+ return;
+
if (Player* owner = killer->GetCharmerOrOwnerPlayerOrPlayerItself())
{
if (Group* group = owner->GetGroup())
diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
index 332480d7be3..db8b2aa5c9a 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
@@ -67,7 +67,7 @@ class boss_cyanigosa : public CreatureScript
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
- _JustDied();
+ _JustDied();
}
void MoveInLineOfSight(Unit* /*who*/) override { }
diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
index b9e6314f6bc..5103dbbc37a 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
@@ -96,7 +96,7 @@ class boss_erekem : public CreatureScript
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
- _JustDied();
+ _JustDied();
}
bool CheckGuardAuras(Creature* guard) const
diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
index 3f56443ee97..c79f707e650 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
@@ -167,7 +167,7 @@ class boss_ichoron : public CreatureScript
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
- _JustDied();
+ _JustDied();
}
void JustSummoned(Creature* summon) override
diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
index 2ac2b548815..d776e0a5245 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
@@ -118,7 +118,7 @@ class boss_xevozz : public CreatureScript
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
- _JustDied();
+ _JustDied();
}
void SpellHit(Unit* /*who*/, SpellInfo const* spell) override
diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
index 015b0d19c1b..57ba6383961 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
@@ -107,7 +107,7 @@ class boss_zuramat : public CreatureScript
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
- _JustDied();
+ _JustDied();
}
void KilledUnit(Unit* victim) override
diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp
index 7eb0420dc1c..c0fbf2620d0 100644
--- a/src/server/scripts/Northrend/zone_borean_tundra.cpp
+++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp
@@ -370,9 +370,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 (player->GetQuestStatus(QUEST_TAKEN_BY_THE_SCOURGE) == QUEST_STATUS_INCOMPLETE)
@@ -1271,8 +1271,8 @@ public:
leryssa->ClearUnitState(UNIT_STATE_STUNNED);
leryssa->SetWalk(false);
leryssa->GetMotionMaster()->MovePoint(0, 3722.114502f, 3564.201660f, 477.441437f);
-
- if (killer && killer->GetTypeId() == TYPEID_PLAYER)
+
+ if (killer && killer->GetTypeId() == TYPEID_PLAYER)
killer->ToPlayer()->RewardPlayerAndGroupAtEvent(NPC_PRINCE_VALANAR, nullptr);
}
};
@@ -1942,9 +1942,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 (player->GetQuestStatus(QUEST_YOU_RE_NOT_SO_BIG_NOW) == QUEST_STATUS_INCOMPLETE &&
diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp
index 7bcc0a4bc56..7cd82b61e0e 100644
--- a/src/server/scripts/Northrend/zone_howling_fjord.cpp
+++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp
@@ -637,9 +637,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 0f7c4ec6e09..cc732f7c6ef 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
@@ -312,11 +312,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 524740afcb9..60370153af4 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
@@ -486,9 +486,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 efcc0778919..8bacf1d283d 100644
--- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
@@ -972,9 +972,9 @@ public:
void JustDied(Unit* killer) override
{
- if (!killer)
- return;
-
+ if (!killer)
+ return;
+
switch (killer->GetTypeId())
{
case TYPEID_UNIT: