Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Unify handling CharacterCreating.Disabled.RaceMask with other racemask fields (#24604)

Browse Source
This commit is contained in:
funjoker
2020-05-17 23:39:17 +02:00
committed by GitHub
parent ce10a9482a
commit 4055434ba6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/game/Handlers/CharacterHandler.cpp
View File

@@ -539,8 +539,8 @@ void WorldSession::HandleCharCreateOpcode(WorldPackets::Character::CreateCharact
if (!HasPermission(rbac::RBAC_PERM_SKIP_CHECK_CHARACTER_CREATION_RACEMASK))
{
uint64 raceMaskDisabled = sWorld->GetUInt64Config(CONFIG_CHARACTER_CREATING_DISABLED_RACEMASK);
if ((UI64LIT(1) << (charCreate.CreateInfo->Race - 1)) & raceMaskDisabled)
Trinity::RaceMask<uint64> raceMaskDisabled{ sWorld->GetUInt64Config(CONFIG_CHARACTER_CREATING_DISABLED_RACEMASK) };
if (raceMaskDisabled.HasRace(charCreate.CreateInfo->Race))
{
SendCharCreate(CHAR_CREATE_DISABLED);
return;
@@ -1893,8 +1893,8 @@ void WorldSession::HandleCharRaceOrFactionChangeCallback(std::shared_ptr<WorldPa
if (!HasPermission(rbac::RBAC_PERM_SKIP_CHECK_CHARACTER_CREATION_RACEMASK))
{
uint64 raceMaskDisabled = sWorld->GetUInt64Config(CONFIG_CHARACTER_CREATING_DISABLED_RACEMASK);
if ((UI64LIT(1) << (factionChangeInfo->RaceID - 1)) & raceMaskDisabled)
Trinity::RaceMask<uint64> raceMaskDisabled{ sWorld->GetUInt64Config(CONFIG_CHARACTER_CREATING_DISABLED_RACEMASK) };
if (raceMaskDisabled.HasRace(factionChangeInfo->RaceID))
{
SendCharFactionChange(CHAR_CREATE_ERROR, factionChangeInfo.get());
return;