jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-25 08:03:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix use of wrong parent when removing arrows for a player (#6308)

Browse source
This commit is contained in:
ebbit1q 2025-11-12 04:48:26 +01:00 • committed by GitHub
parent 840ee1379f
commit 648f028a63
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
View file

@ -587,27 +587,26 @@ void Server_Game::removeArrowsRelatedToPlayer(GameEventStorage &ges, Server_Abst
// Also remove all arrows starting at one of his cards. This is necessary since players can create // Also remove all arrows starting at one of his cards. This is necessary since players can create
// arrows that start at another person's cards. // arrows that start at another person's cards.
for (Server_AbstractPlayer *anyPlayer : getPlayers().values()) { for (Server_AbstractPlayer *anyPlayer : getPlayers().values()) {
QList<Server_Arrow *> arrows = anyPlayer->getArrows().values();
QList<Server_Arrow *> toDelete; QList<Server_Arrow *> toDelete;
for (int i = 0; i < arrows.size(); ++i) { for (auto *arrow : anyPlayer->getArrows().values()) {
Server_Arrow *arrow = arrows[i];
Server_Card *targetCard = qobject_cast<Server_Card *>(arrow->getTargetItem()); Server_Card *targetCard = qobject_cast<Server_Card *>(arrow->getTargetItem());
if (targetCard) { if (targetCard) {
if (targetCard->getZone() != nullptr && targetCard->getZone()->getPlayer() == player) if (targetCard->getZone() != nullptr && targetCard->getZone()->getPlayer() == player)
toDelete.append(arrow); toDelete.append(arrow);
} else if (static_cast<Server_AbstractPlayer *>(arrow->getTargetItem()) == player) } else if (arrow->getTargetItem() == player) {
toDelete.append(arrow); toDelete.append(arrow);
}
// Don't use else here! It has to happen regardless of whether targetCard == 0. // Don't use else here! It has to happen regardless of whether targetCard == 0.
if (arrow->getStartCard()->getZone() != nullptr && arrow->getStartCard()->getZone()->getPlayer() == player) if (arrow->getStartCard()->getZone() != nullptr && arrow->getStartCard()->getZone()->getPlayer() == player)
toDelete.append(arrow); toDelete.append(arrow);
} }
for (int i = 0; i < toDelete.size(); ++i) { for (auto *arrow : toDelete) {
Event_DeleteArrow event; Event_DeleteArrow event;
event.set_arrow_id(toDelete[i]->getId()); event.set_arrow_id(arrow->getId());
ges.enqueueGameEvent(event, player->getPlayerId()); ges.enqueueGameEvent(event, anyPlayer->getPlayerId());
player->deleteArrow(toDelete[i]->getId()); anyPlayer->deleteArrow(arrow->getId());
} }
} }
} }