diff options
13 files changed, 43 insertions, 40 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 658e17606ae..2fa94f57ca3 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -2788,7 +2788,7 @@ BanReturn World::BanCharacter(std::string const& name, std::string const& durati else guid = banned->GetGUID().GetCounter(); //Use transaction in order to ensure the order of the queries - SQLTransaction trans = CharacterDatabase.BeginTransaction(); + SQLTransaction trans = CharacterDatabase.BeginTransaction(); // make sure there is only one active ban PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_CHARACTER_BAN); stmt->setUInt32(0, guid); diff --git a/src/server/scripts/Commands/cs_group.cpp b/src/server/scripts/Commands/cs_group.cpp index 6c78aaa05bc..75f3e222497 100644 --- a/src/server/scripts/Commands/cs_group.cpp +++ b/src/server/scripts/Commands/cs_group.cpp @@ -185,7 +185,7 @@ public: return true; } - static bool GroupFlagCommand(ChatHandler* handler, char const* args, GroupMemberFlags flag, const char* what) + static bool GroupFlagCommand(ChatHandler* handler, char const* args, GroupMemberFlags flag, char const* what) { Player* player = nullptr; Group* group = nullptr; diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp index e6c0b8516ea..e94412cb681 100644 --- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp +++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp @@ -130,7 +130,7 @@ public: { EscortAI::UpdateAI(diff); } - + void EnterEvadeMode(EvadeReason why) override { if (!me->HasAura(RUUL_SHAPECHANGE)) diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp index 88341f62c5b..0adaf778e13 100644 --- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp @@ -68,9 +68,9 @@ public: void JustDied(Unit* killer) override { - if (!killer) - return; - + if (!killer) + return; + uint32 spawnCreatureID = 0; switch (urand(0, 2)) @@ -265,10 +265,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 82899b65ff4..6ee613636ed 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -488,7 +488,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 ff532ed5a59..6c447004b4c 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 @@ -203,10 +203,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 d7387f4a869..6e73bedbcf3 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -369,8 +369,8 @@ class boss_lady_deathwhisper : public CreatureScript 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()) { @@ -895,8 +895,8 @@ class npc_darnavan : public CreatureScript { _events.Reset(); - if (!killer) - return; + if (!killer) + return; if (Player* owner = killer->GetCharmerOrOwnerPlayerOrPlayerItself()) { diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index fab3265b7d1..13ceb04742d 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 1ac10fe4e1f..3be62e1aeb7 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 ed6be37b23a..cc92cf2bd85 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 9802ff1bb44..bd17c8e5d77 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 066787e9af4..79ad40c501b 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 21efd45d8e7..6af5ea78700 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) @@ -1238,26 +1238,29 @@ public: { DoCastVictim(SPELL_SHADOW_BOLT); shadowBoltTimer = urand(5000, 12000); - } else shadowBoltTimer -= diff; + } + else shadowBoltTimer -= diff; if (deflectionTimer <= diff) { DoCastVictim(SPELL_DEFLECTION); deflectionTimer = urand(20000, 25000); - } else deflectionTimer -= diff; + } + else deflectionTimer -= diff; if (soulBlastTimer <= diff) { DoCastVictim(SPELL_SOUL_BLAST); - soulBlastTimer = urand(12000, 18000); - } else soulBlastTimer -= diff; + soulBlastTimer = urand(12000, 18000); + } + else soulBlastTimer -= diff; } DoMeleeAttackIfReady(); - } + } - void JustDied(Unit* killer) override - { + void JustDied(Unit* killer) override + { if (!leryssaGUID || !arlosGUID) return; @@ -1274,8 +1277,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, 0); } }; @@ -1945,14 +1948,14 @@ 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 && (me->HasAura(SPELL_AURA_NOTSOBIG_1) || me->HasAura(SPELL_AURA_NOTSOBIG_2) || - me->HasAura(SPELL_AURA_NOTSOBIG_3) || me->HasAura(SPELL_AURA_NOTSOBIG_4))) + me->HasAura(SPELL_AURA_NOTSOBIG_3) || me->HasAura(SPELL_AURA_NOTSOBIG_4))) { Quest const* qInfo = sObjectMgr->GetQuestTemplate(QUEST_YOU_RE_NOT_SO_BIG_NOW); if (qInfo) |