From d800c87137088f2cfdb66e8086c64321ca9c3509 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 6 May 2022 18:45:51 +0200 Subject: Core/Misc: Remove implicit conversions from RaceMask class, fixes racemask check failing during loading from db --- src/server/game/Spells/SpellMgr.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/game/Spells/SpellMgr.cpp') diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index fd780964fcb..f1a3f88fead 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -715,7 +715,7 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32 if (!player || gender != player->GetNativeGender()) return false; - if (raceMask) // is not expected race + if (!raceMask.IsEmpty()) // is not expected race if (!player || !raceMask.HasRace(player->GetRace())) return false; @@ -2291,7 +2291,7 @@ void SpellMgr::LoadSpellAreas() continue; if (spellArea.auraSpell != itr->second.auraSpell) continue; - if ((spellArea.raceMask & itr->second.raceMask) == 0) + if ((spellArea.raceMask & itr->second.raceMask).IsEmpty()) continue; if (spellArea.gender != itr->second.gender) continue; @@ -2382,7 +2382,7 @@ void SpellMgr::LoadSpellAreas() } } - if (spellArea.raceMask && (spellArea.raceMask.RawValue & RACEMASK_ALL_PLAYABLE) == 0) + if (!spellArea.raceMask.IsEmpty() && (spellArea.raceMask & RACEMASK_ALL_PLAYABLE).IsEmpty()) { TC_LOG_ERROR("sql.sql", "The spell %u listed in `spell_area` has wrong race mask (" UI64FMTD ") requirement.", spell, spellArea.raceMask.RawValue); continue; -- cgit v1.2.3