From 4fd2f1f9746ac8a020725dabac85fa6a4c43c108 Mon Sep 17 00:00:00 2001 From: RickyRister <42636155+RickyRister@users.noreply.github.com> Date: Wed, 16 Jul 2025 04:03:05 -0700 Subject: [PATCH] Fix turning cards face-up not having correct printing (#6043) --- cockatrice/src/game/player/player.cpp | 6 +++--- common/pb/event_flip_card.proto | 1 + common/server_player.cpp | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp index d51bd83be..4528aa9aa 100644 --- a/cockatrice/src/game/player/player.cpp +++ b/cockatrice/src/game/player/player.cpp @@ -2472,10 +2472,10 @@ void Player::eventFlipCard(const Event_FlipCard &event) return; } - QString cardName = QString::fromStdString(event.card_name()); if (!event.face_down()) { - // TODO: also set providerId - card->setCardRef({cardName}); + QString cardName = QString::fromStdString(event.card_name()); + QString providerId = QString::fromStdString(event.card_provider_id()); + card->setCardRef({cardName, providerId}); } emit logFlipCard(this, card->getName(), event.face_down()); diff --git a/common/pb/event_flip_card.proto b/common/pb/event_flip_card.proto index 08a5d8c6d..06f7c7cf7 100644 --- a/common/pb/event_flip_card.proto +++ b/common/pb/event_flip_card.proto @@ -9,4 +9,5 @@ message Event_FlipCard { optional sint32 card_id = 2; optional string card_name = 3; optional bool face_down = 4; + optional string card_provider_id = 5; } diff --git a/common/server_player.cpp b/common/server_player.cpp index 989f7706e..5f0667dee 100644 --- a/common/server_player.cpp +++ b/common/server_player.cpp @@ -1324,6 +1324,7 @@ Server_Player::cmdFlipCard(const Command_FlipCard &cmd, ResponseContainer & /*rc event.set_card_id(card->getId()); if (!faceDown) { event.set_card_name(card->getName().toStdString()); + event.set_card_provider_id(card->getProviderId().toStdString()); } event.set_face_down(faceDown); ges.enqueueGameEvent(event, playerId);