NPCBots: Fix CI build 1

(cherry picked from commit 24d8460d68b67375f70673300847838afa34f8cf)
trickerer · Dec 5, 2024 · 6e18edc · 6e18edc
1 parent b44d931
commit 6e18edc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/server/game/AI/NpcBots/bot_ai.cpp b/src/server/game/AI/NpcBots/bot_ai.cpp
@@ -19360,7 +19360,7 @@ WanderNode const* bot_ai::GetNextWanderNode(Position const* fromPos, uint8 lvl,
     if (me->IsFFAPvP())
     {
         ChrRacesEntry const* rentry = sChrRacesStore.LookupEntry(me->GetRace());
-        faction = (_botclass >= BOT_CLASS_EX_START) ? FACTION_TEMPLATE_NEUTRAL_HOSTILE : rentry ? rentry->FactionID : FACTION_TEMPLATE_NEUTRAL_HOSTILE;
+        faction = (_botclass >= BOT_CLASS_EX_START) ? uint32(FACTION_TEMPLATE_NEUTRAL_HOSTILE) : rentry ? rentry->FactionID : uint32(FACTION_TEMPLATE_NEUTRAL_HOSTILE);
     }
 
     //Node got deleted (or forced)! Select close point and go from there

diff --git a/src/server/game/AI/NpcBots/botcommands.cpp b/src/server/game/AI/NpcBots/botcommands.cpp
@@ -3371,8 +3371,7 @@ class script_bot_commands : public CommandScript
 
             if (teamid)
             {
-                ChrRacesEntry const* rentry = sChrRacesStore.LookupEntry(race);
-                uint32 faction = rentry ? rentry->FactionID : FACTION_TEMPLATE_NEUTRAL_HOSTILE;
+                uint32 faction = BotDataMgr::GetDefaultFactionForBotRace(race);
                 TeamId team = BotDataMgr::GetTeamIdForFaction(faction);
 
                 if (*teamid != uint8(team))

diff --git a/src/server/game/AI/NpcBots/botdatamgr.cpp b/src/server/game/AI/NpcBots/botdatamgr.cpp
@@ -3226,7 +3226,7 @@ int32 BotDataMgr::GetBotBaseReputation(Creature const* bot, FactionEntry const*
 uint32 BotDataMgr::GetDefaultFactionForBotRace(uint8 bot_race)
 {
     ChrRacesEntry const* rentry = sChrRacesStore.LookupEntry(bot_race);
-    return rentry ? rentry->FactionID : FACTION_TEMPLATE_NEUTRAL_HOSTILE;
+    return rentry ? rentry->FactionID : uint32(FACTION_TEMPLATE_NEUTRAL_HOSTILE);
 }
 
 TeamId BotDataMgr::GetTeamIdForFaction(uint32 factionTemplateId)