浏览代码

Fixed CID 1375686

AlexVinS 8 年之前
父节点
当前提交
25d06c8d70
共有 1 个文件被更改,包括 6 次插入2 次删除
  1. 6 2
      server/CGameHandler.cpp

+ 6 - 2
server/CGameHandler.cpp

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