diff options
13 files changed, 37 insertions, 37 deletions
diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index 352ae635878..5b76b583d24 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -283,7 +283,7 @@ bool CreatureAI::_EnterEvadeMode(EvadeReason /*why*/) int32 CreatureAI::VisualizeBoundary(uint32 duration, Unit* owner, bool fill) const { typedef std::pair<int32, int32> coordinate; - + if (!owner) return -1; @@ -293,7 +293,7 @@ int32 CreatureAI::VisualizeBoundary(uint32 duration, Unit* owner, bool fill) con std::queue<coordinate> Q; std::unordered_set<coordinate> alreadyChecked; std::unordered_set<coordinate> outOfBounds; - + Position startPosition = owner->GetPosition(); if (!CheckBoundary(&startPosition)) // fall back to creature position { diff --git a/src/server/game/AI/PlayerAI/PlayerAI.h b/src/server/game/AI/PlayerAI/PlayerAI.h index f3d27de95a6..31c57c7af6c 100644 --- a/src/server/game/AI/PlayerAI/PlayerAI.h +++ b/src/server/game/AI/PlayerAI/PlayerAI.h @@ -28,7 +28,7 @@ class TC_GAME_API PlayerAI : public UnitAI explicit PlayerAI(Player* player) : UnitAI(static_cast<Unit*>(player)), me(player), _isSelfHealer(PlayerAI::IsPlayerHealer(player)), _isSelfRangedAttacker(PlayerAI::IsPlayerRangedAttacker(player)) { } void OnCharmed(bool /*apply*/) override { } // charm AI application for players is handled by Unit::SetCharmedBy / Unit::RemoveCharmedBy - + // helper functions to determine player info static bool IsPlayerHealer(Player const* who); bool IsHealer(Player const* who = nullptr) const { return (!who || who == me) ? _isSelfHealer : IsPlayerHealer(who); } diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 1e6c0122f11..44f150f98a5 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -555,7 +555,7 @@ void BossAI::_DespawnAtEvade(uint32 delayToRespawn) me->SetCorpseDelay(corpseDelay); me->SetRespawnDelay(respawnDelay); - if(instance) + if (instance) instance->SetBossState(_bossId, FAIL); } diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 1d5482fa8ee..b376c256246 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2736,7 +2736,7 @@ bool Creature::FocusTarget(Spell const* focusSpell, WorldObject const* target) if (target) SetInFront(target); else if (!canTurnDuringCast) - if(Unit* victim = GetVictim()) + if (Unit* victim = GetVictim()) SetInFront(victim); // ensure server-side orientation is correct at beginning of cast if (!canTurnDuringCast) diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index aa2b2c28ede..fefb20b6fd3 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -393,7 +393,7 @@ bool WorldSession::Update(uint32 diff, PacketFilter& updater) LogUnexpectedOpcode(packet, "STATUS_TRANSFER", "the player has not logged in yet"); else if (_player->IsInWorld()) LogUnexpectedOpcode(packet, "STATUS_TRANSFER", "the player is still in world"); - else if(AntiDOS.EvaluateOpcode(*packet, currentTime)) + else if (AntiDOS.EvaluateOpcode(*packet, currentTime)) { sScriptMgr->OnPacketReceive(this, *packet); opHandle->Call(this, *packet); diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 160948cccce..6e8323de24e 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -598,7 +598,7 @@ m_spellValue(new SpellValue(caster->GetMap()->GetDifficultyID(), m_spellInfo)), //Auto Shot & Shoot (wand) m_autoRepeat = m_spellInfo->IsAutoRepeatRangedSpell(); - + m_isDelayedInstantCast = false; m_runesState = 0; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index d4de862244c..43ef7e006ef 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -161,8 +161,8 @@ public: me->SetVisible(true); } - void EnterCombat(Unit* /*who*/) override - { + void EnterCombat(Unit* /*who*/) override + { if (InstanceScript* instance = me->GetInstanceScript()) instance->SetBossState(DATA_ATTUMEN, IN_PROGRESS); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp index e660c3e2dde..d272d1674ea 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp @@ -23,7 +23,7 @@ #include "WorldPacket.h" #include "ruby_sanctum.h" -BossBoundaryData const boundaries = +BossBoundaryData const boundaries = { { DATA_GENERAL_ZARITHRIAN, new EllipseBoundary(Position(3013.409f, 529.492f), 45.0, 100.0) }, { DATA_HALION, new CircleBoundary(Position(3156.037f, 533.2656f), 48.5) } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 675d7d4e308..df792fbe1de 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -169,7 +169,7 @@ public: boss_thaddiusAI(Creature* creature) : BossAI(creature, BOSS_THADDIUS), stalaggAlive(true), feugenAlive(true), ballLightningEnabled(false), shockingEligibility(true) { if (instance->GetBossState(BOSS_THADDIUS) != DONE) - { + { events.SetPhase(PHASE_NOT_ENGAGED); SetCombatMovement(false); @@ -223,7 +223,7 @@ public: events.SetPhase(PHASE_PETS); shockingEligibility = true; - + if (!instance->CheckRequiredBosses(BOSS_THADDIUS)) return BeginResetEncounter(); instance->SetBossState(BOSS_THADDIUS, IN_PROGRESS); @@ -365,7 +365,7 @@ public: me->RemoveAura(SPELL_THADDIUS_INACTIVE_VISUAL); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); - + DoZoneInCombat(); if (Unit* closest = SelectTarget(SELECT_TARGET_NEAREST, 0, 500.0f)) AttackStart(closest); @@ -521,7 +521,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); Talk(EMOTE_FEIGN_REVIVE); isFeignDeath = false; - + refreshBeam = true; // force beam refresh if (Creature* feugen = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_FEUGEN))) @@ -586,7 +586,7 @@ public: damage = 0; return; } - + isFeignDeath = true; isOverloading = false; @@ -790,7 +790,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); Talk(EMOTE_FEIGN_REVIVE); isFeignDeath = false; - + refreshBeam = true; // force beam refresh if (Creature* stalagg = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_STALAGG))) @@ -922,7 +922,7 @@ public: magneticPullTimer = 20 * IN_MILLISECONDS; } else magneticPullTimer -= uiDiff; - + if (staticFieldTimer <= uiDiff) { DoCast(me, SPELL_FEUGEN_STATICFIELD); @@ -971,7 +971,7 @@ public: ObjectGuid _myCoil; ObjectGuid _myCoilGO; - + bool isOverloading; bool refreshBeam; bool isFeignDeath; @@ -1169,7 +1169,7 @@ class spell_thaddius_magnetic_pull : public SpellScriptLoader Unit* feugen = GetCaster(); if (!feugen || feugen->GetEntry() != NPC_FEUGEN) return; - + Unit* stalagg = ObjectAccessor::GetCreature(*feugen, feugen->GetInstanceScript()->GetGuidData(DATA_STALAGG)); if (!stalagg) return; diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index 2bf50a0b8f5..95e13fa4068 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -20,7 +20,7 @@ #include "InstanceScript.h" #include "naxxramas.h" -BossBoundaryData const boundaries = +BossBoundaryData const boundaries = { /* Arachnid Quarter */ { BOSS_ANUBREKHAN, new CircleBoundary(Position(3273.376709f, -3475.876709f), Position(3195.668213f, -3475.930176f)) }, diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp index 8f2d5a61770..547dc681ac6 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp @@ -19,7 +19,7 @@ #include "InstanceScript.h" #include "utgarde_pinnacle.h" -BossBoundaryData const boundaries = +BossBoundaryData const boundaries = { { DATA_KING_YMIRON, new RectangleBoundary(340.0f, 450.0f, -412.0f, -275.0f) } }; diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 8748c8a8fd8..172abdd3663 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -1140,7 +1140,7 @@ class go_toy_train_set : public GameObjectScript struct go_toy_train_setAI : public GameObjectAI { go_toy_train_setAI(GameObject* go) : GameObjectAI(go), _pulseTimer(3 * IN_MILLISECONDS) { } - + void UpdateAI(uint32 diff) override { if (diff < _pulseTimer) diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 7f9f59a5209..edc0e96234d 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -3134,21 +3134,21 @@ AuctionHouseBot.Items.Yellow.Price.Ratio = 100 # Description: Percentage by which the price of items sold of each class is incremented / decreased (for all houses) # Default: 100 - (No change) -AuctionHouseBot.Class.Consumable.Price.Ratio = 100 -AuctionHouseBot.Class.Container.Price.Ratio = 100 -AuctionHouseBot.Class.Weapon.Price.Ratio = 100 -AuctionHouseBot.Class.Gem.Price.Ratio = 100 -AuctionHouseBot.Class.Armor.Price.Ratio = 100 -AuctionHouseBot.Class.Reagent.Price.Ratio = 100 -AuctionHouseBot.Class.Projectile.Price.Ratio = 100 -AuctionHouseBot.Class.TradeGood.Price.Ratio = 100 -AuctionHouseBot.Class.Generic.Price.Ratio = 100 -AuctionHouseBot.Class.Recipe.Price.Ratio = 100 -AuctionHouseBot.Class.Quiver.Price.Ratio = 100 -AuctionHouseBot.Class.Quest.Price.Ratio = 100 -AuctionHouseBot.Class.Key.Price.Ratio = 100 -AuctionHouseBot.Class.Misc.Price.Ratio = 100 -AuctionHouseBot.Class.Glyph.Price.Ratio = 100 +AuctionHouseBot.Class.Consumable.Price.Ratio = 100 +AuctionHouseBot.Class.Container.Price.Ratio = 100 +AuctionHouseBot.Class.Weapon.Price.Ratio = 100 +AuctionHouseBot.Class.Gem.Price.Ratio = 100 +AuctionHouseBot.Class.Armor.Price.Ratio = 100 +AuctionHouseBot.Class.Reagent.Price.Ratio = 100 +AuctionHouseBot.Class.Projectile.Price.Ratio = 100 +AuctionHouseBot.Class.TradeGood.Price.Ratio = 100 +AuctionHouseBot.Class.Generic.Price.Ratio = 100 +AuctionHouseBot.Class.Recipe.Price.Ratio = 100 +AuctionHouseBot.Class.Quiver.Price.Ratio = 100 +AuctionHouseBot.Class.Quest.Price.Ratio = 100 +AuctionHouseBot.Class.Key.Price.Ratio = 100 +AuctionHouseBot.Class.Misc.Price.Ratio = 100 +AuctionHouseBot.Class.Glyph.Price.Ratio = 100 # # AuctionHouseBot.Items.ItemLevel.* |