Commit 6fb16545 authored by Max-Wilhelm Bruker's avatar Max-Wilhelm Bruker
Browse files

Fixed server crash when unattaching card

parent d7b3764b
...@@ -670,11 +670,14 @@ ResponseCode Server_ProtocolHandler::cmdAttachCard(Command_AttachCard *cmd, Comm ...@@ -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.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment