diff options
| -rw-r--r-- | src/server/game/DungeonFinding/LFGMgr.h | 3 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/CollectionMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/StatSystem.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/MovementPackets.cpp | 2 |
5 files changed, 4 insertions, 8 deletions
diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h index c3a77bb53c5..407d8c295e7 100644 --- a/src/server/game/DungeonFinding/LFGMgr.h +++ b/src/server/game/DungeonFinding/LFGMgr.h @@ -27,6 +27,7 @@ class Group; class Player; class Quest; +struct LfgDungeonsEntry; namespace lfg { @@ -133,8 +134,6 @@ struct LfgProposal; struct LfgProposalPlayer; struct LfgPlayerBoot; -struct LfgDungeonsEntry; - typedef std::map<uint8, LFGQueue> LfgQueueContainer; typedef std::multimap<uint32, LfgReward const*> LfgRewardContainer; typedef std::pair<LfgRewardContainer::const_iterator, LfgRewardContainer::const_iterator> LfgRewardContainerBounds; diff --git a/src/server/game/Entities/Player/CollectionMgr.cpp b/src/server/game/Entities/Player/CollectionMgr.cpp index 45d893f8c95..b9205822638 100644 --- a/src/server/game/Entities/Player/CollectionMgr.cpp +++ b/src/server/game/Entities/Player/CollectionMgr.cpp @@ -579,7 +579,7 @@ std::unordered_set<ObjectGuid> CollectionMgr::GetItemsProvidingTemporaryAppearan if (temporaryAppearance != _temporaryAppearances.end()) return temporaryAppearance->second; - return{}; + return std::unordered_set<ObjectGuid>(); } void CollectionMgr::SetAppearanceIsFavorite(uint32 itemModifiedAppearanceId, bool apply) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 9389f114b89..8e4da6952f1 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -5158,7 +5158,9 @@ void Player::UpdateRating(CombatRating cr) case CR_PVP_POWER: case CR_CLEAVE: case CR_VERSATILITY_DAMAGE_DONE: + case CR_VERSATILITY_HEALING_DONE: case CR_VERSATILITY_DAMAGE_TAKEN: + case CR_UNUSED_12: break; } } diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp index 13a84e499f2..231742b65b6 100644 --- a/src/server/game/Entities/Unit/StatSystem.cpp +++ b/src/server/game/Entities/Unit/StatSystem.cpp @@ -964,9 +964,6 @@ void Creature::CalculateMinMaxDamage(WeaponAttackType attType, bool normalized, bool Guardian::UpdateStats(Stats stat) { - if (stat >= MAX_STATS) - return false; - // value = ((base_value * base_pct) + total_value) * total_pct float value = GetTotalStatValue(stat); ApplyStatBuffMod(stat, m_statFromOwner[stat], false); diff --git a/src/server/game/Server/Packets/MovementPackets.cpp b/src/server/game/Server/Packets/MovementPackets.cpp index cbd8da859a5..0a77af16b83 100644 --- a/src/server/game/Server/Packets/MovementPackets.cpp +++ b/src/server/game/Server/Packets/MovementPackets.cpp @@ -291,8 +291,6 @@ void WorldPackets::Movement::CommonMovement::WriteCreateObjectSplineDataBlock(:: if (hasSplineMove) // MovementSplineMove { - ::Movement::MoveSplineFlag const& splineFlags = moveSpline.splineflags; - data << uint32(moveSpline.splineflags.raw()); // SplineFlags data << int32(moveSpline.timePassed()); // Elapsed data << uint32(moveSpline.Duration()); // Duration |