diff options
author | jackpoz <giacomopoz@gmail.com> | 2020-04-05 15:23:56 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2022-01-01 01:00:26 +0100 |
commit | ecdc387df2d4fb9602bb10765898949f99e7c5c5 (patch) | |
tree | f6dc7838812dfb60ddd14d898eec5df62085e58b | |
parent | 4df9ab2a3fe1dde5c0c516fbcb610453f4759cda (diff) |
Core/Misc: Remove whitespace at the end of lines
(cherry picked from commit caae3886d24adf0a5fc95454bb1c45477057bde4)
-rw-r--r-- | src/server/game/AI/CoreAI/PetAI.cpp | 2 | ||||
-rw-r--r-- | src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp | 4 | ||||
-rw-r--r-- | src/server/game/Chat/Channels/Channel.h | 2 | ||||
-rw-r--r-- | src/server/scripts/Commands/cs_misc.cpp | 2 | ||||
-rw-r--r-- | src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp | 2 | ||||
-rw-r--r-- | src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp | 4 | ||||
-rw-r--r-- | src/server/scripts/Kalimdor/zone_desolace.cpp | 4 | ||||
-rw-r--r-- | src/server/scripts/Kalimdor/zone_the_barrens.cpp | 4 | ||||
-rw-r--r-- | src/server/scripts/World/go_scripts.cpp | 4 | ||||
-rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 2 | ||||
-rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 2 |
11 files changed, 16 insertions, 16 deletions
diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp index a7309e9039b..878bdc27618 100644 --- a/src/server/game/AI/CoreAI/PetAI.cpp +++ b/src/server/game/AI/CoreAI/PetAI.cpp @@ -420,7 +420,7 @@ void PetAI::DoAttack(Unit* target, bool chase) if (me->HasUnitState(UNIT_STATE_FOLLOW)) me->GetMotionMaster()->Remove(FOLLOW_MOTION_TYPE); - + // Pets with ranged attacks should not care about the chase angle at all. float chaseDistance = me->GetPetChaseDistance(); float angle = chaseDistance == 0.f ? float(M_PI) : 0.f; diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp index 10ac56e2eff..354d21d5d9f 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp @@ -81,7 +81,7 @@ void EscortAI::InitializeAI() if (me->GetFaction() != me->GetCreatureTemplate()->faction) me->RestoreFaction(); - + Reset(); } @@ -95,7 +95,7 @@ void EscortAI::EnterEvadeMode(EvadeReason /*why*/) me->RemoveAllAuras(); me->CombatStop(true); me->SetLootRecipient(nullptr); - + EngagementOver(); if (HasEscortState(STATE_ESCORT_ESCORTING)) diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h index efff8d0fca8..61f6f0c7cf2 100644 --- a/src/server/game/Chat/Channels/Channel.h +++ b/src/server/game/Chat/Channels/Channel.h @@ -250,7 +250,7 @@ class TC_GAME_API Channel bool IsOn(ObjectGuid who) const { return _playersStore.find(who) != _playersStore.end(); } bool IsBanned(ObjectGuid guid) const { return _bannedStore.find(guid) != _bannedStore.end(); } - + uint8 GetPlayerFlags(ObjectGuid const& guid) const { diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index d7515aa40aa..0dc57d01566 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -1334,7 +1334,7 @@ public: if (count < 0) { uint32 destroyedItemCount = playerTarget->DestroyItemCount(itemId, -count, true, false); - + if (destroyedItemCount > 0) { // output the amount of items successfully destroyed diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index f62c84c7dc0..ac89662c293 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -1390,7 +1390,7 @@ public: me->CombatStop(true); me->InterruptNonMeleeSpells(false); me->SetWalk(false); - + EngagementOver(); for (uint8 i = 0; i < ENCOUNTER_DEFENDER_NUMBER; ++i) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 1ea1ccf835a..87a6a1cba9d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -423,9 +423,9 @@ void hyjalAI::EnterEvadeMode(EvadeReason /*why*/) if (me->GetEntry() != JAINA) me->RemoveAllAuras(); me->CombatStop(true); - + EngagementOver(); - + me->LoadCreaturesAddon(); if (me->IsAlive()) me->GetMotionMaster()->MoveTargetedHome(); diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp index 24f76c0b216..9ae1fb8d987 100644 --- a/src/server/scripts/Kalimdor/zone_desolace.cpp +++ b/src/server/scripts/Kalimdor/zone_desolace.cpp @@ -87,9 +87,9 @@ public: me->CombatStop(); me->SetFaction(FACTION_FRIENDLY); me->SetSpeedRate(MOVE_RUN, 0.6f); - + EngagementOver(); - + me->GetMotionMaster()->MoveFollow(caster, PET_FOLLOW_DIST, me->GetFollowAngle()); me->setActive(true); me->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP); diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index bfb838b5ab3..60e3416fb01 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -179,9 +179,9 @@ public: me->RemoveAllAuras(); me->CombatStop(true); me->StopMoving(); - + EngagementOver(); - + me->GetMotionMaster()->MoveIdle(); me->SetFaction(FACTION_FRIENDLY); me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 49058008051..0390938200b 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -1791,7 +1791,7 @@ public: _soundId = BELLTOLLHORDE; // undead bell sound break; default: - _soundId = BELLTOLLTRIBAL; // orc drum sound + _soundId = BELLTOLLTRIBAL; // orc drum sound break; } break; @@ -1810,7 +1810,7 @@ public: _soundId = BELLTOLLNIGHTELF; // nightelf bell sound break; default: - _soundId = BELLTOLLALLIANCE; // human bell sound + _soundId = BELLTOLLALLIANCE; // human bell sound } break; } diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index dd1c4352062..8ec777e74d1 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -182,7 +182,7 @@ public: AirForceSpawn const& _spawn; ObjectGuid _myGuard; std::unordered_set<ObjectGuid> _toAttack; - + }; CreatureAI* GetAI(Creature* creature) const override diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 70b824420d5..8e2c0cb143d 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -1173,7 +1173,7 @@ MinQuestScaledXPRatio = 0 # # MinCreatureScaledXPRatio -# Description: Min ratio of experience that a creature kill can grant when player level scaling is factored. This +# Description: Min ratio of experience that a creature kill can grant when player level scaling is factored. This # will also allow spell procs to trigger, such as Drain Soul, if > 0 and exp is grantable. # Example: 50 (No less than 50% experience granted from a lower leveled creature kill) # 100 (Creature kills always grant full experience upon kill) |