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

merged server crash fix

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2012-04-22 11:02:36 +02:00
commit 7649a36962
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/server_player.cpp
View file

@ -350,7 +350,13 @@ Response::ResponseCode Server_Player::moveCard(GameEventStorage &ges, Server_Car
QList<QPair<Server_Card *, int> > cardsToMove; QList<QPair<Server_Card *, int> > cardsToMove;
QMap<Server_Card *, const CardToMove *> cardProperties; QMap<Server_Card *, const CardToMove *> cardProperties;
QSet<int> cardIdsToMove;
for (int i = 0; i < _cards.size(); ++i) { for (int i = 0; i < _cards.size(); ++i) {
// The same card being moved twice would lead to undefined behaviour.
if (cardIdsToMove.contains(_cards[i]->card_id()))
continue;
cardIdsToMove.insert(_cards[i]->card_id());
int position; int position;
Server_Card *card = startzone->getCard(_cards[i]->card_id(), &position); Server_Card *card = startzone->getCard(_cards[i]->card_id(), &position);
if (!card) if (!card)