From b506a534430049d9abc5fc757bca3651c0ca67d0 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 21 Oct 2024 23:34:43 +0200 Subject: Core/Misc: Update faction change learned language skills for new races --- src/server/game/Globals/ObjectMgr.cpp | 5 ++++- src/server/game/Handlers/CharacterHandler.cpp | 9 +++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index cfa7a86fa08..745c5081715 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -4307,7 +4307,10 @@ void ObjectMgr::LoadPlayerInfo() if (sWorld->getIntConfig(CONFIG_EXPANSION) < EXPANSION_LEGION && class_ == CLASS_DEMON_HUNTER) continue; - if (sWorld->getIntConfig(CONFIG_EXPANSION) < EXPANSION_DRAGONFLIGHT && class_ == CLASS_EVOKER) + if (sWorld->getIntConfig(CONFIG_EXPANSION) < EXPANSION_DRAGONFLIGHT && (class_ == CLASS_EVOKER || race == RACE_DRACTHYR_ALLIANCE || race == RACE_DRACTHYR_HORDE)) + continue; + + if (sWorld->getIntConfig(CONFIG_EXPANSION) < EXPANSION_THE_WAR_WITHIN && (race == RACE_EARTHEN_DWARF_HORDE || race == RACE_EARTHEN_DWARF_ALLIANCE)) continue; // fatal error if no level 1 data diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 1b22dafff94..f6602b8421f 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -2323,14 +2323,19 @@ void WorldSession::HandleCharRaceOrFactionChangeCallback(std::shared_ptrsetUInt16(1, 2776); break; - case LANG_PANDAREN_ALLIANCE: - case LANG_PANDAREN_HORDE: + case RACE_PANDAREN_NEUTRAL: + case RACE_PANDAREN_ALLIANCE: + case RACE_PANDAREN_HORDE: stmt->setUInt16(1, 905); break; case RACE_DRACTHYR_ALLIANCE: case RACE_DRACTHYR_HORDE: stmt->setUInt16(1, 138); break; + case RACE_EARTHEN_DWARF_HORDE: + case RACE_EARTHEN_DWARF_ALLIANCE: + stmt->setUInt16(1, 140); + break; default: TC_LOG_ERROR("entities.player", "Could not find language data for race ({}).", factionChangeInfo->RaceID); SendCharFactionChange(CHAR_CREATE_ERROR, factionChangeInfo.get()); -- cgit v1.2.3