Skip to content

Commit

Permalink
NPCBots: Fix CI build 1
Browse files Browse the repository at this point in the history
(cherry picked from commit a2ff4fce0f8dc1a107c5978cc360056bfe2b8ffc)

# Conflicts:
#	src/server/game/Battlegrounds/Battleground.cpp
  • Loading branch information
trickerer committed Nov 8, 2024
1 parent 88e176f commit 1c30326
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/server/game/AI/NpcBots/bot_ai.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/server/game/AI/NpcBots/bpet_ai.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 1c30326

Please sign in to comment.