From 1c303267141a2329c74729ef77012e71be31ee17 Mon Sep 17 00:00:00 2001 From: trickerer Date: Fri, 8 Nov 2024 18:59:34 +0700 Subject: [PATCH] NPCBots: Fix CI build 1 (cherry picked from commit a2ff4fce0f8dc1a107c5978cc360056bfe2b8ffc) # Conflicts: # src/server/game/Battlegrounds/Battleground.cpp --- src/server/game/AI/NpcBots/bot_ai.cpp | 2 +- src/server/game/AI/NpcBots/bpet_ai.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/game/AI/NpcBots/bot_ai.cpp b/src/server/game/AI/NpcBots/bot_ai.cpp index a7ac857aabee02..f0a85bf883f08b 100644 --- a/src/server/game/AI/NpcBots/bot_ai.cpp +++ b/src/server/game/AI/NpcBots/bot_ai.cpp @@ -17686,7 +17686,7 @@ bool bot_ai::GlobalUpdate(uint32 diff) uint32 fac_orig = rEntry ? rEntry->FactionID : 0; if (master->GetFaction() == fac_orig) { - uint32 fac = (!IAmFree() && me->GetMap()->IsBattleArena()) ? FACTION_MONSTER : fac_orig; + uint32 fac = (!IAmFree() && me->GetMap()->IsBattleArena()) ? uint32(FACTION_MONSTER) : fac_orig; if (me->GetFaction() != fac) { //std::ostringstream msg; diff --git a/src/server/game/AI/NpcBots/bpet_ai.cpp b/src/server/game/AI/NpcBots/bpet_ai.cpp index b26bb9b3cc0a29..3730781043229a 100644 --- a/src/server/game/AI/NpcBots/bpet_ai.cpp +++ b/src/server/game/AI/NpcBots/bpet_ai.cpp @@ -2440,7 +2440,7 @@ bool bot_pet_ai::GlobalUpdate(uint32 diff) uint32 fac_orig = rEntry ? rEntry->FactionID : 0; if (petOwner->GetBotOwner()->GetFaction() == fac_orig) { - uint32 fac = (!IAmFree() && me->GetMap()->IsBattleArena()) ? FACTION_MONSTER : fac_orig; + uint32 fac = (!IAmFree() && me->GetMap()->IsBattleArena()) ? uint32(FACTION_MONSTER) : fac_orig; if (me->GetFaction() != fac) me->SetFaction(fac); }