games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-13 01:20:34 +02:00
Code Issues Releases Activity

Merge pull request #4421 from SoundSSGood/endBattleConfirm-fix

Browse Source 
endBattleConfirm crash fix
This commit is contained in:
Ivan Savenko
2024-08-09 15:22:58 +03:00
committed by GitHub
parent 9f489b306c 5903b3b42c
commit 1b6fd45aa7
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/battles/BattleResultProcessor.cpp
View File

@ -447,7 +447,6 @@ void BattleResultProcessor::endBattleConfirm(const CBattleInfoCallback & battle)
addArtifactToTransfer(packCommander, artSlot.first, artSlot.second.getArt()); addArtifactToTransfer(packCommander, artSlot.first, artSlot.second.getArt());
sendArtifacts(packCommander); sendArtifacts(packCommander);
} }
}
auto armyObj = battle.battleGetArmyObject(battle.otherSide(battleResult->winner)); auto armyObj = battle.battleGetArmyObject(battle.otherSide(battleResult->winner));
for(const auto & armySlot : armyObj->stacks) for(const auto & armySlot : armyObj->stacks)
{ {
@ -458,6 +457,7 @@ void BattleResultProcessor::endBattleConfirm(const CBattleInfoCallback & battle)
addArtifactToTransfer(packsArmy, artSlot.first, armySlot.second->getArt(artSlot.first)); addArtifactToTransfer(packsArmy, artSlot.first, armySlot.second->getArt(artSlot.first));
sendArtifacts(packsArmy); sendArtifacts(packsArmy);
} }
}
// Display loot // Display loot
if(!arts.empty()) if(!arts.empty())
{ {