From e15806db34405e0ff74adfeb2abbe0c5b6b96dca Mon Sep 17 00:00:00 2001 From: Max-Wilhelm Bruker Date: Fri, 10 Sep 2010 22:40:46 +0200 Subject: [PATCH] arrow crash bugfix --- common/server_protocolhandler.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/server_protocolhandler.cpp b/common/server_protocolhandler.cpp index bdce48c3..1d70464b 100644 --- a/common/server_protocolhandler.cpp +++ b/common/server_protocolhandler.cpp @@ -761,10 +761,11 @@ ResponseCode Server_ProtocolHandler::cmdCreateArrow(Command_CreateArrow *cmd, Co return RespNameNotFound; Server_Card *startCard = startZone->getCard(cmd->getStartCardId(), false); Server_Card *targetCard = 0; - if (!playerTarget) + if (!playerTarget) { targetCard = targetZone->getCard(cmd->getTargetCardId(), false); - if (!startCard || (!targetCard && !playerTarget) || (startCard == targetCard) || (startZone->getType() != PublicZone) || (targetZone->getType() != PublicZone)) - return RespContextError; + if ((startZone->getType() != PublicZone) || (targetZone->getType() != PublicZone)) + return RespContextError; + } Server_ArrowTarget *targetItem; if (playerTarget)