From eecfe9d3874865b425f58675a89350b029be8420 Mon Sep 17 00:00:00 2001
From: BruebachL <44814898+BruebachL@users.noreply.github.com>
Date: Sat, 13 Sep 2025 12:44:09 +0200
Subject: [PATCH] Forward playerActions signals to playerEventHandler (#6126)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Took 54 minutes

Took 7 seconds

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
---
 cockatrice/src/game/game_event_handler.cpp | 10 ----------
 cockatrice/src/game/player/player.cpp      | 14 ++++++++++++++
 cockatrice/src/game/player/player.h        |  1 +
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/cockatrice/src/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp
index d06ae828e..d2dd97a2c 100644
--- a/cockatrice/src/game/game_event_handler.cpp
+++ b/cockatrice/src/game/game_event_handler.cpp
@@ -123,44 +123,34 @@ void GameEventHandler::processGameEventContainer(const GameEventContainer &cont,
 
             switch (eventType) {
                 case GameEvent::GAME_STATE_CHANGED:
-                    qInfo() << "Game state changed event";
                     eventGameStateChanged(event.GetExtension(Event_GameStateChanged::ext), playerId, context);
                     break;
                 case GameEvent::PLAYER_PROPERTIES_CHANGED:
-                    qInfo() << "player prop event";
                     eventPlayerPropertiesChanged(event.GetExtension(Event_PlayerPropertiesChanged::ext), playerId,
                                                  context);
                     break;
                 case GameEvent::JOIN:
-                    qInfo() << "join event";
                     eventJoin(event.GetExtension(Event_Join::ext), playerId, context);
                     break;
                 case GameEvent::LEAVE:
-                    qInfo() << "leave event";
                     eventLeave(event.GetExtension(Event_Leave::ext), playerId, context);
                     break;
                 case GameEvent::KICKED:
-                    qInfo() << "kicked event";
                     eventKicked(event.GetExtension(Event_Kicked::ext), playerId, context);
                     break;
                 case GameEvent::GAME_HOST_CHANGED:
-                    qInfo() << "host changed event";
                     eventGameHostChanged(event.GetExtension(Event_GameHostChanged::ext), playerId, context);
                     break;
                 case GameEvent::GAME_CLOSED:
-                    qInfo() << "game closed event";
                     eventGameClosed(event.GetExtension(Event_GameClosed::ext), playerId, context);
                     break;
                 case GameEvent::SET_ACTIVE_PLAYER:
-                    qInfo() << "set active player event";
                     eventSetActivePlayer(event.GetExtension(Event_SetActivePlayer::ext), playerId, context);
                     break;
                 case GameEvent::SET_ACTIVE_PHASE:
-                    qInfo() << "set active phase";
                     eventSetActivePhase(event.GetExtension(Event_SetActivePhase::ext), playerId, context);
                     break;
                 case GameEvent::REVERSE_TURN:
-                    qInfo() << "reverse turn event";
                     eventReverseTurn(event.GetExtension(Event_ReverseTurn::ext), playerId, context);
                     break;
 
diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp
index 2e5c247df..001b6bcec 100644
--- a/cockatrice/src/game/player/player.cpp
+++ b/cockatrice/src/game/player/player.cpp
@@ -43,6 +43,20 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, A
     connect(this, &Player::activeChanged, graphicsItem, &PlayerGraphicsItem::onPlayerActiveChanged);
 
     connect(this, &Player::openDeckEditor, game->getTab(), &TabGame::openDeckEditor);
+
+    forwardActionSignalsToEventHandler();
+}
+
+// Event Handler is the controller i.e. everything hooks up to this to know about player state
+// Player should forward (private) signals to the event handler
+
+void Player::forwardActionSignalsToEventHandler()
+{
+    connect(playerActions, &PlayerActions::logSetTapped, playerEventHandler, &PlayerEventHandler::logSetTapped);
+    connect(playerActions, &PlayerActions::logSetDoesntUntap, playerEventHandler,
+            &PlayerEventHandler::logSetDoesntUntap);
+    connect(playerActions, &PlayerActions::logSetAnnotation, playerEventHandler, &PlayerEventHandler::logSetAnnotation);
+    connect(playerActions, &PlayerActions::logSetPT, playerEventHandler, &PlayerEventHandler::logSetPT);
 }
 
 void Player::initializeZones()
diff --git a/cockatrice/src/game/player/player.h b/cockatrice/src/game/player/player.h
index 14da854b2..255c9ab8b 100644
--- a/cockatrice/src/game/player/player.h
+++ b/cockatrice/src/game/player/player.h
@@ -75,6 +75,7 @@ public slots:
 
 public:
     Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, AbstractGame *_parent);
+    void forwardActionSignalsToEventHandler();
     ~Player() override;
 
     void initializeZones();