diff options
14 files changed, 33 insertions, 33 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index f73a0b1b993..0d54bfad0f7 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -77,13 +77,13 @@ void SmartWaypointMgr::LoadFromDB() TC_LOG_ERROR("sql.sql", "SmartWaypointMgr::LoadFromDB: Path entry %u, unexpected point id %u, expected %u.", entry, id, last_id); last_id++; - + WayPoint point; point.id = id; point.x = x; point.y = y; point.z = z; - + path.push_back(std::move(point)); last_entry = entry; diff --git a/src/server/game/Battlegrounds/ArenaTeamMgr.cpp b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp index 6fe11e3bd8c..2570dfbae2f 100644 --- a/src/server/game/Battlegrounds/ArenaTeamMgr.cpp +++ b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp @@ -188,7 +188,7 @@ void ArenaTeamMgr::DistributeArenaPoints() { if (at->FinishWeek()) at->SaveToDB(); - + at->NotifyStatsChanged(); } } diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp index e6f88f97e17..0df34c6b698 100644 --- a/src/server/game/Scripting/ScriptSystem.cpp +++ b/src/server/game/Scripting/ScriptSystem.cpp @@ -109,7 +109,7 @@ void SystemMgr::LoadScriptSplineChains() uint16 chainId = fieldsMeta[1].GetUInt16(); uint8 splineId = fieldsMeta[2].GetUInt8(); SplineChain& chain = m_mSplineChainsMap[{entry,chainId}]; - + if (splineId != chain.size()) { TC_LOG_WARN("server.loading", "Creature #%u: Chain %u has orphaned spline %u, skipped.", entry, chainId, splineId); diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 5ff633a6031..1d5911a4598 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -2828,7 +2828,7 @@ bool SpellInfo::CanSpellProvideImmunityAgainstAura(SpellInfo const* auraSpellInf if (auraSpellInfo->Dispel == dispelImmunity) return true; - bool immuneToAllEffects = true; + bool immuneToAllEffects = true; for (uint8 effIndex = 0; effIndex < MAX_SPELL_EFFECTS; ++effIndex) { uint32 effectName = auraSpellInfo->Effects[effIndex].Effect; diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 2860698a8b2..58e752a4b33 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -150,7 +150,7 @@ public: return; } _guardianTrigger = (*summoned.begin())->GetGUID(); - + if (Creature* trigger = DoSummon(NPC_WORLD_TRIGGER, me->GetPosition(), 0u, TEMPSUMMON_MANUAL_DESPAWN)) _assassinTrigger = trigger->GetGUID(); else @@ -361,7 +361,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); me->RemoveAurasDueToSpell(SPELL_LEECHING_SWARM); DoCastSelf(SPELL_IMPALE_AURA, true); - + events.SetPhase(PHASE_SUBMERGE); switch (_nextSubmerge) { diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index c41ec1c488d..da9b8cb6b81 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -380,7 +380,7 @@ public: summons.Summon(summon); // Do not enter combat with zone } - + private: bool _enteredCombat; // has a player entered combat with the first crusher pack? (talk and spawn two more packs) bool _doorsWebbed; // obvious - have we reached the top and webbed the doors shut? (trigger for hadronox denied achievement) @@ -616,7 +616,7 @@ class npc_anub_ar_crusher_champion : public CreatureScript } }; -static const Position cryptFiendWaypoints[] = +static const Position cryptFiendWaypoints[] = { { 520.3911f, 548.7895f, 732.0118f, 5.0091f }, { }, diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 0d52a09bbdc..0a3cb88f448 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -917,7 +917,7 @@ class spell_gatewatcher_subboss_trigger : public SpellScriptLoader { public: spell_gatewatcher_subboss_trigger() : SpellScriptLoader("spell_gatewatcher_subboss_trigger") { } - + class spell_gatewatcher_subboss_trigger_SpellScript : public SpellScript { PrepareSpellScript(spell_gatewatcher_subboss_trigger_SpellScript); @@ -1027,7 +1027,7 @@ class spell_gatewatcher_web_wrap : public SpellScriptLoader OnEffectRemove += AuraEffectRemoveFn(spell_gatewatcher_web_wrap_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_ROOT, AURA_EFFECT_HANDLE_REAL); } }; - + AuraScript* GetAuraScript() const override { return new spell_gatewatcher_web_wrap_AuraScript(); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp index 7f0ce5c369e..66131a9fc72 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -46,7 +46,7 @@ ObjectData const gameobjectData[] = { 0, 0 } // END }; -BossBoundaryData const boundaries = +BossBoundaryData const boundaries = { { DATA_KRIKTHIR, new RectangleBoundary(400.0f, 580.0f, 623.5f, 810.0f) }, { DATA_HADRONOX, new ZRangeBoundary(666.0f, 776.0f) }, diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index cb5a7462000..5e7d9372e44 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -705,7 +705,7 @@ enum MessengerTorvus { NPC_MESSENGER_TORVUS = 26649, QUEST_MESSAGE_FROM_THE_WEST = 12033, - + TALK_0 = 0 }; diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 0068b5a343a..e53f3ff7701 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -46,7 +46,7 @@ enum Entries SPELL_HEALING_POTION = 17534, SPELL_BURN = 42685, - + EVENT_EMOTE_BEG = 1, EVENT_BEGIN = 2, EVENT_START_ESCORT = 3, diff --git a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp index f0d5aaa16ac..4a5aae8f193 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp @@ -289,7 +289,7 @@ public: me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, false); me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false); ScheduleEvents(); - + // Attack the stored target if (Unit* oldTarget = ObjectAccessor::GetUnit(*me, _oldTargetGUID)) if (Unit* currentTarget = ObjectAccessor::GetUnit(*me, _targetGUID)) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 9d9d985166e..a334365f710 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -844,7 +844,7 @@ class boss_kaelthas : public CreatureScript default: break; } - + if (me->HasUnitState(UNIT_STATE_CASTING) && !me->FindCurrentSpellBySpellId(SPELL_KAEL_GAINING_POWER) && !me->FindCurrentSpellBySpellId(SPELL_KAEL_STUNNED)) return; } diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 9ef5c5d0b4d..ae639b43ba9 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -121,13 +121,13 @@ enum AlchemistStone SPELL_ALCHEMISTS_STONE_EXTRA_MANA = 21400 }; -// Item - 13503: Alchemist's Stone -// Item - 35748: Guardian's Alchemist Stone -// Item - 35749: Sorcerer's Alchemist Stone -// Item - 35750: Redeemer's Alchemist Stone -// Item - 35751: Assassin's Alchemist Stone -// Item - 44322: Mercurial Alchemist Stone -// Item - 44323: Indestructible Alchemist's Stone +// Item - 13503: Alchemist's Stone +// Item - 35748: Guardian's Alchemist Stone +// Item - 35749: Sorcerer's Alchemist Stone +// Item - 35750: Redeemer's Alchemist Stone +// Item - 35751: Assassin's Alchemist Stone +// Item - 44322: Mercurial Alchemist Stone +// Item - 44323: Indestructible Alchemist's Stone // Item - 44324: Mighty Alchemist's Stone // 17619 - Alchemist's Stone @@ -282,9 +282,9 @@ class spell_item_arcane_shroud : public SpellScriptLoader }; // Item - 12846: Argent Dawn Commission -// Item - 13209: Seal of the Dawn -// Item - 19812: Rune of the Dawn - +// Item - 13209: Seal of the Dawn +// Item - 19812: Rune of the Dawn + // 17670 - Argent Dawn Commission class spell_item_argent_dawn_commission : public SpellScriptLoader { @@ -331,7 +331,7 @@ enum AuraOfMadness SAY_MADNESS = 21954 }; -// Item - 31859: Darkmoon Card: Madness +// Item - 31859: Darkmoon Card: Madness // 39446 - Aura of Madness class spell_item_aura_of_madness : public SpellScriptLoader { @@ -1362,8 +1362,8 @@ enum MarkOfConquest SPELL_MARK_OF_CONQUEST_ENERGIZE = 39599 }; -// Item - 27920: Mark of Conquest -// Item - 27921: Mark of Conquest +// Item - 27920: Mark of Conquest +// Item - 27921: Mark of Conquest // 33510 - Health Restore class spell_item_mark_of_conquest : public SpellScriptLoader { @@ -4439,9 +4439,9 @@ class spell_item_universal_remote : public SpellScriptLoader { uint8 chance = urand(0, 99); if (chance < 15) - GetCaster()->CastSpell(target, SPELL_TARGET_LOCK, true, GetCastItem()); + GetCaster()->CastSpell(target, SPELL_TARGET_LOCK, true, GetCastItem()); else if (chance < 25) - GetCaster()->CastSpell(target, SPELL_MOBILITY_MALFUNCTION, true, GetCastItem()); + GetCaster()->CastSpell(target, SPELL_MOBILITY_MALFUNCTION, true, GetCastItem()); else GetCaster()->CastSpell(target, SPELL_CONTROL_MACHINE, true, GetCastItem()); } diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index af9cf8e591b..86d290c9556 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -1270,7 +1270,7 @@ class go_toy_train_set : public GameObjectScript enum BrewfestMusic { EVENT_BREWFESTDWARF01 = 11810, // 1.35 min - EVENT_BREWFESTDWARF02 = 11812, // 1.55 min + EVENT_BREWFESTDWARF02 = 11812, // 1.55 min EVENT_BREWFESTDWARF03 = 11813, // 0.23 min EVENT_BREWFESTGOBLIN01 = 11811, // 1.08 min EVENT_BREWFESTGOBLIN02 = 11814, // 1.33 min @@ -1402,7 +1402,7 @@ public: enum MidsummerMusic { EVENTMIDSUMMERFIREFESTIVAL_A = 12319, // 1.08 min - EVENTMIDSUMMERFIREFESTIVAL_H = 12325, // 1.12 min + EVENTMIDSUMMERFIREFESTIVAL_H = 12325, // 1.12 min }; enum MidsummerMusicEvents |