diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-03-30 19:06:11 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-03-30 19:06:11 +0200 |
| commit | 3cc50e69f1ece93e8542fb43575453ae4bcc5e61 (patch) | |
| tree | e771165c1f4dd9c82407207634cb6023f3dd9520 /src/server/game/Spells/SpellMgr.cpp | |
| parent | 642dd62cc7b8bfc4d4d04d2d06462737d73fcfe6 (diff) | |
Core/Players: Fixed racemasks usage for new races
Diffstat (limited to 'src/server/game/Spells/SpellMgr.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index cbb035a4b3c..ab73f8338a2 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -621,7 +621,7 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32 return false; if (raceMask) // is not expected race - if (!player || !(raceMask & player->getRaceMask())) + if (!player || !raceMask.HasRace(player->getRace())) return false; if (areaId) // is not in expected zone @@ -2070,7 +2070,7 @@ void SpellMgr::LoadSpellAreas() spellArea.questEndStatus = fields[4].GetUInt32(); spellArea.questEnd = fields[5].GetUInt32(); spellArea.auraSpell = fields[6].GetInt32(); - spellArea.raceMask = fields[7].GetUInt64(); + spellArea.raceMask.RawValue = fields[7].GetUInt64(); spellArea.gender = Gender(fields[8].GetUInt8()); spellArea.flags = fields[9].GetUInt8(); @@ -2189,9 +2189,9 @@ void SpellMgr::LoadSpellAreas() } } - if (spellArea.raceMask && (spellArea.raceMask & RACEMASK_ALL_PLAYABLE) == 0) + if (spellArea.raceMask && (spellArea.raceMask.RawValue & RACEMASK_ALL_PLAYABLE) == 0) { - TC_LOG_ERROR("sql.sql", "The spell %u listed in `spell_area` has wrong race mask (" UI64FMTD ") requirement.", spell, spellArea.raceMask); + TC_LOG_ERROR("sql.sql", "The spell %u listed in `spell_area` has wrong race mask (" UI64FMTD ") requirement.", spell, spellArea.raceMask.RawValue); continue; } |