From 8e1dc785eb87c49775b1a963239d2504dc26afd7 Mon Sep 17 00:00:00 2001 From: Andrii Danylchenko Date: Fri, 28 Jul 2023 14:19:12 +0300 Subject: [PATCH] Wrong player was engaged for 5lvl dwelling --- server/CGameHandler.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/CGameHandler.cpp b/server/CGameHandler.cpp index 9df39108a..0d2f16456 100644 --- a/server/CGameHandler.cpp +++ b/server/CGameHandler.cpp @@ -2118,6 +2118,9 @@ void CGameHandler::setupBattle(int3 tile, const CArmedInstance *armies[2], const //send info about battles BattleStart bs; bs.info = BattleInfo::setupBattle(tile, terrain, terType, armies, heroes, creatureBank, town); + + engageIntoBattle(bs.info->sides[0].color); + engageIntoBattle(bs.info->sides[1].color); sendAndApply(&bs); } @@ -2577,9 +2580,6 @@ void CGameHandler::startBattlePrimary(const CArmedInstance *army1, const CArmedI if(gs->curB) gs->curB.dellNull(); - engageIntoBattle(army1->tempOwner); - engageIntoBattle(army2->tempOwner); - static const CArmedInstance *armies[2]; armies[0] = army1; armies[1] = army2;