From ac9636c44e1175c1585ecdcdf013978f5faa979c Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Thu, 23 Apr 2020 14:07:15 +0800 Subject: [PATCH] Fix uncleared selectables when a player concedes and restarts next game --- .../src/main/java/forge/screens/match/CMatchUI.java | 1 + forge-gui-mobile/src/forge/screens/match/MatchController.java | 1 + 2 files changed, 2 insertions(+) diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java index b16504526ba..0ef13bb3e19 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java @@ -966,6 +966,7 @@ public final class CMatchUI players = new FCollection<>(new PlayerView[]{players.get(1), players.get(0)}); } initMatch(players, myPlayers); + clearSelectables(); //fix uncleared selection actuateMatchPreferences(); diff --git a/forge-gui-mobile/src/forge/screens/match/MatchController.java b/forge-gui-mobile/src/forge/screens/match/MatchController.java index dd9dc99c313..bb1a451fa4c 100644 --- a/forge-gui-mobile/src/forge/screens/match/MatchController.java +++ b/forge-gui-mobile/src/forge/screens/match/MatchController.java @@ -147,6 +147,7 @@ public class MatchController extends AbstractGuiGame { } view = new MatchScreen(playerPanels); view.resetFields(); + clearSelectables(); //fix uncleared selection if (noHumans) { //add special object that pauses game if screen touched