From e918856fa46700ed41ebde531ca22ebbe4dc6264 Mon Sep 17 00:00:00 2001 From: ebbit1q Date: Sat, 18 Apr 2026 12:50:53 +0200 Subject: [PATCH] clear player before removing it from the scene (#6817) revert #6740 --- cockatrice/src/game/board/card_item.cpp | 3 --- cockatrice/src/game/game_event_handler.cpp | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/cockatrice/src/game/board/card_item.cpp b/cockatrice/src/game/board/card_item.cpp index cf3c7db20..62de4a02e 100644 --- a/cockatrice/src/game/board/card_item.cpp +++ b/cockatrice/src/game/board/card_item.cpp @@ -460,9 +460,6 @@ void CardItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) bool CardItem::animationEvent() { - if (owner == nullptr) { - return false; - } int rotation = ROTATION_DEGREES_PER_FRAME; bool animationIncomplete = true; if (!tapped) diff --git a/cockatrice/src/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp index 7bfc4da75..42dd49458 100644 --- a/cockatrice/src/game/game_event_handler.cpp +++ b/cockatrice/src/game/game_event_handler.cpp @@ -429,13 +429,13 @@ void GameEventHandler::eventLeave(const Event_Leave &event, int eventPlayerId, c if (!player) return; + player->clear(); emit playerLeft(eventPlayerId); emit logLeave(player, getLeaveReason(event.reason())); game->getPlayerManager()->removePlayer(eventPlayerId); - player->clear(); player->deleteLater(); // Rearrange all remaining zones so that attachment relationship updates take place