From 7b3617a2738eeeec7c2f4863fe6fd06122eb77c9 Mon Sep 17 00:00:00 2001 From: ebbit1q Date: Sat, 28 Oct 2023 20:35:15 +0200 Subject: [PATCH] clean up #4904 for consistency (#4927) note, this is not a racetime issue, see #4907 --- common/server_game.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/server_game.cpp b/common/server_game.cpp index 6f8cd63c..f4f15c8e 100644 --- a/common/server_game.cpp +++ b/common/server_game.cpp @@ -565,13 +565,13 @@ void Server_Game::removeArrowsRelatedToPlayer(GameEventStorage &ges, Server_Play Server_Arrow *a = arrows[i]; Server_Card *targetCard = qobject_cast(a->getTargetItem()); if (targetCard) { - if (targetCard->getZone()->getPlayer() == player) + if (targetCard->getZone() != nullptr && targetCard->getZone()->getPlayer() == player) toDelete.append(a); } else if (static_cast(a->getTargetItem()) == player) toDelete.append(a); // 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); } for (int i = 0; i < toDelete.size(); ++i) {