diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-07-10 00:33:43 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-07-10 00:37:33 +0200 |
| commit | 0d9136f7648e623d6b15d67e2d4d83e91d3603da (patch) | |
| tree | e2b8a2daf702b21a5e9670d9705e7d18fbd3b094 /src/server/game/Globals/ObjectMgr.cpp | |
| parent | ef344664e3ee1bef048cf197d416e83b95c74e30 (diff) | |
| parent | a78aa3cf4ef3f33903ec9f06d8fdc46e81c51cb3 (diff) | |
Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into legion
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 0ea0f832405..d3d33a22ad3 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -43,7 +43,6 @@ #include "SpellAuras.h" #include "SpellMgr.h" #include "SpellScript.h" -#include "UpdateMask.h" #include "Util.h" #include "Vehicle.h" #include "World.h" @@ -2671,9 +2670,10 @@ void ObjectMgr::LoadItemTemplates() if (std::vector<ItemSpecOverrideEntry const*> const* itemSpecOverrides = sDB2Manager.GetItemSpecOverrides(sparse->ID)) { for (ItemSpecOverrideEntry const* itemSpecOverride : *itemSpecOverrides) - itemTemplate.Specializations[0].insert(itemSpecOverride->SpecID); + if (ChrSpecializationEntry const* specialization = sChrSpecializationStore.LookupEntry(itemSpecOverride->SpecID)) + itemTemplate.Specializations[0].set(ItemTemplate::CalculateItemSpecBit(specialization)); - itemTemplate.Specializations[1] = itemTemplate.Specializations[0]; + itemTemplate.Specializations[1] |= itemTemplate.Specializations[0]; } else { @@ -2704,7 +2704,7 @@ void ObjectMgr::LoadItemTemplates() if ((1 << (specialization->ClassID - 1)) & sparse->AllowableClass) { itemTemplate.ItemSpecClassMask |= 1 << (specialization->ClassID - 1); - itemTemplate.Specializations[itemSpec->MaxLevel > 40].insert(itemSpec->SpecID); + itemTemplate.Specializations[itemSpec->MaxLevel > 40].set(ItemTemplate::CalculateItemSpecBit(specialization)); } } } |