Merge pull request #6423 from kdmcser/only_commander_left_crash

Fix crash when losing battle vs neutral creatures (null winnerHero commander)
This commit is contained in:
Ivan Savenko
2025-12-10 20:38:37 +02:00
committed by GitHub
+1 -2
View File
@@ -416,8 +416,7 @@ void BattleResultProcessor::battleFinalize(const BattleID & battleID, const Batt
{
winnerHero = (*battle)->battleGetFightingHero(finishingBattle->winnerSide);
loserHero = (*battle)->battleGetFightingHero(CBattleInfoEssentials::otherSide(finishingBattle->winnerSide));
auto commander = winnerHero->getCommander();
winnerHasUnitsLeft = winnerHero ? winnerHero->stacksCount() > 0 || (commander && commander->alive) : true;
winnerHasUnitsLeft = winnerHero ? winnerHero->stacksCount() > 0 || (winnerHero->getCommander() && winnerHero->getCommander()->alive) : true;
}
BattleResultsApplied resultsApplied;