diff options
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 7 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.h | 2 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/SharedDefines.h | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index f5618905f0a..548deb58fb7 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -27355,7 +27355,7 @@ Pet* Player::SummonPet(uint32 entry, Optional<PetSaveMode> slot, float x, float return pet; } -std::array<uint32, MAX_CLASS_ID + 1> MasterySpells = +std::array<uint32, MAX_CLASSES> MasterySpells = { 0, 87500, // Warrior @@ -27368,7 +27368,10 @@ std::array<uint32, MAX_CLASS_ID + 1> MasterySpells = 86467, // Mage 87498, // Warlock 0, - 87491 // Druid + 87491, // Druid + 0, + 0, + 0 }; bool Player::CanUseMastery() const diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 555b4a0a72c..251a6319af2 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -192,7 +192,7 @@ struct PlayerSpell bool favorite : 1; }; -extern std::array<uint32, MAX_CLASS_ID + 1> MasterySpells; +extern std::array<uint32, MAX_CLASSES> MasterySpells; struct StoredAuraTeleportLocation { diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index eec7e2c16fe..f832c33d9e1 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -163,7 +163,6 @@ enum Classes : uint8 // max+1 for player class #define MAX_CLASSES 15 -constexpr uint32 MAX_CLASS_ID = CLASS_DRUID; #define CLASSMASK_ALL_PLAYABLE \ ((1<<(CLASS_WARRIOR-1)) | \ |