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

clean up #4904 for consistency (#4927)

Browse source 
note, this is not a racetime issue, see #4907
This commit is contained in:
ebbit1q 2023-10-28 20:35:15 +02:00 committed by GitHub
parent 3e8adae3de
commit 7b3617a273
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/server_game.cpp
View file

@ -565,13 +565,13 @@ void Server_Game::removeArrowsRelatedToPlayer(GameEventStorage &ges, Server_Play
Server_Arrow *a = arrows[i]; Server_Arrow *a = arrows[i];
Server_Card *targetCard = qobject_cast<Server_Card *>(a->getTargetItem()); Server_Card *targetCard = qobject_cast<Server_Card *>(a->getTargetItem());
if (targetCard) { if (targetCard) {
if (targetCard->getZone()->getPlayer() == player) if (targetCard->getZone() != nullptr && targetCard->getZone()->getPlayer() == player)
toDelete.append(a); toDelete.append(a);
} else if (static_cast<Server_Player *>(a->getTargetItem()) == player) } else if (static_cast<Server_Player *>(a->getTargetItem()) == player)
toDelete.append(a); toDelete.append(a);
// 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 (a->getStartCard()->getZone() && a->getStartCard()->getZone()->getPlayer() == player) if (a->getStartCard()->getZone() != nullptr && a->getStartCard()->getZone()->getPlayer() == player)
toDelete.append(a); toDelete.append(a);
} }
for (int i = 0; i < toDelete.size(); ++i) { for (int i = 0; i < toDelete.size(); ++i) {