From 8447e58c39b48802d9392de9520f5ade8a1db3c4 Mon Sep 17 00:00:00 2001 From: mateuszb Date: Fri, 29 Jan 2010 18:17:07 +0000 Subject: [PATCH] * fixed #72, #242, #252 (all crashes seem to be caused by harpy dying in retaliation and causing end of battle) --- server/CGameHandler.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/CGameHandler.cpp b/server/CGameHandler.cpp index 7af8aa726..b61bef738 100644 --- a/server/CGameHandler.cpp +++ b/server/CGameHandler.cpp @@ -2676,9 +2676,10 @@ bool CGameHandler::makeBattleAction( BattleAction &ba ) } //return - if(curStack->hasFeatureOfType(StackFeature::RETURN_AFTER_STRIKE) && startingPos != curStack->position) + if(curStack->hasFeatureOfType(StackFeature::RETURN_AFTER_STRIKE) && startingPos != curStack->position && curStack->alive()) { moveStack(ba.stackNumber, startingPos); + //NOTE: curStack->ID == ba.stackNumber (rev 1431) } sendAndApply(&EndAction()); break;