From c35798eac8cad90f5cfe500d3b265db5fa2c100d Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Sun, 26 Dec 2021 22:36:21 +0100
Subject: [PATCH] Fix cards in hand being hidden when proceeding to second game

---
 forge-game/src/main/java/forge/game/card/CardView.java |  2 +-
 .../java/forge/gamemodes/match/AbstractGuiGame.java    | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/card/CardView.java b/forge-game/src/main/java/forge/game/card/CardView.java
index bf15f7c21cc..c175fb7f829 100644
--- a/forge-game/src/main/java/forge/game/card/CardView.java
+++ b/forge-game/src/main/java/forge/game/card/CardView.java
@@ -517,7 +517,7 @@ public class CardView extends GameEntityView {
             }
             break;
         case Hand:
-            if (controller == viewer) {
+            if (controller.equals(viewer)) {
                 return true;
             }
             break;
diff --git a/forge-gui/src/main/java/forge/gamemodes/match/AbstractGuiGame.java b/forge-gui/src/main/java/forge/gamemodes/match/AbstractGuiGame.java
index 3c463db2b4b..3f48d4a07d1 100644
--- a/forge-gui/src/main/java/forge/gamemodes/match/AbstractGuiGame.java
+++ b/forge-gui/src/main/java/forge/gamemodes/match/AbstractGuiGame.java
@@ -156,8 +156,7 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards {
         if (gameController == null) {
             if (originalGameControllers.containsKey(player)) {
                 gameControllers.put(player, originalGameControllers.get(player));
-            }
-            else {
+            } else {
                 gameControllers.remove(player);
                 autoPassUntilEndOfTurn.remove(player);
                 final PlayerView currentPlayer = getCurrentPlayer();
@@ -763,19 +762,18 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards {
             final String yesButtonText, final String noButtonText) {
         return showConfirmDialog(message, title, yesButtonText, noButtonText, true);
     }
-    
+
     @Override
     public void notifyStackAddition(GameEventSpellAbilityCast event) { 
     }
-    
+
     @Override
     public void notifyStackRemoval(GameEventSpellRemovedFromStack event) {
     }
     
     @Override
     public void handleLandPlayed(Card land) {
-    }  
-
+    }
 
     @Override
     public void afterGameEnd() {