games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-12 02:28:11 +02:00
Code Issues Releases Activity

Fixed CID 1375686

Browse Source
This commit is contained in:
AlexVinS 2017-05-28 15:00:55 +03:00
parent f5cdaece6f
commit 25d06c8d70
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/CGameHandler.cpp
View File

@ -3982,6 +3982,11 @@ bool CGameHandler::makeBattleAction(BattleAction &ba)
complain("Cannot shoot!");
break;
}
if (!destinationStack)
{
complain("No target to shoot!");
break;
}
auto wrapper = wrapAction(ba);
@ -3995,8 +4000,7 @@ bool CGameHandler::makeBattleAction(BattleAction &ba)
}
//ranged counterattack
if (destinationStack
&& destinationStack->hasBonusOfType(Bonus::RANGED_RETALIATION)
if (destinationStack->hasBonusOfType(Bonus::RANGED_RETALIATION)
&& !stack->hasBonusOfType(Bonus::BLOCKS_RANGED_RETALIATION)
&& destinationStack->ableToRetaliate()
&& stack->alive()) //attacker may have died (fire shield)