aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed server crash when unattaching card

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2010-09-14 17:20:59 +02:00
parent d7b3764bba
commit 6fb16545ee
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/server_protocolhandler.cpp
View file

@ -670,11 +670,14 @@ ResponseCode Server_ProtocolHandler::cmdAttachCard(Command_AttachCard *cmd, Comm
return RespContextError; return RespContextError;
if (targetPlayer) if (targetPlayer)
targetzone = targetPlayer->getZones().value(cmd->getTargetZone()); targetzone = targetPlayer->getZones().value(cmd->getTargetZone());
if (targetzone) if (targetzone) {
// This is currently enough to make sure cards don't get attached to a card that is not on the table.
// Possibly a flag will have to be introduced for this sometime.
if (!targetzone->hasCoords())
return RespContextError;
targetCard = targetzone->getCard(cmd->getTargetCardId(), false); targetCard = targetzone->getCard(cmd->getTargetCardId(), false);
// This is currently enough to make sure cards don't get attached to a card that is not on the table. }
// Possibly a flag will have to be introduced for this sometime. if (!startzone->hasCoords())
if (!startzone->hasCoords() || !targetzone->hasCoords())
return RespContextError; return RespContextError;
// Get all arrows pointing to or originating from the card being attached and delete them. // Get all arrows pointing to or originating from the card being attached and delete them.