Refresh local-player controller keys on match restart

Root-cause fix for docked zone tabs showing the previous game's cards after
"Start New Match".

getLocalPlayers() returns gameControllers.keySet(), keyed by PlayerView
(equality is by id). Desktop reuses the GUI across matches without clearing
the map, so when setOriginalGameController re-registers the new game's live
PlayerView, HashMap.put keeps the id-equal old key and only swaps the value --
keySet() then hands back the prior game's orphaned view, which never updates.
registerZoneDocs binds docked zones to that stale view.

Removing the id-equal entry before re-putting makes the live instance the key,
so getLocalPlayers() returns live views for every consumer. Only the key
changes; the value and all id-based lookups are untouched, so existing callers
behave identically. Reverts the desktop-scoped registerZoneDocs workaround.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: MostCromulent

forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java

@@ -940,14 +940,7 @@ public void updateTurn(final PlayerView player) {
     @Override
     public void updatePlayerControl() {
         initHandViews();
-        // Use live PlayerViews; getLocalPlayers() can hand back an orphaned key from the prior game (equality is by id)
-        final List<PlayerView> localPlayers = new ArrayList<>();
-        for (final PlayerView p : getGameView().getPlayers()) {
-            if (isLocalPlayer(p)) {
-                localPlayers.add(p);
-            }
-        }
-        FloatingZone.registerZoneDocs(this, localPlayers);
+        FloatingZone.registerZoneDocs(this, getLocalPlayers());
         SLayoutIO.loadLayout(null);
         FloatingZone.pruneUnparentedDocks();
         view.populate();

forge-gui/src/main/java/forge/gamemodes/match/AbstractGuiGame.java

@@ -190,8 +190,12 @@ public void setOriginalGameController(PlayerView player, final IGameController g
 
         player = TrackableTypes.PlayerViewType.lookup(player); //ensure we use the correct player
 
+        // HashMap.put keeps the existing key on an id-equal put and PlayerView equality is by id, so without
+        // removing first, re-registration across matches would retain the prior game's stale PlayerView
         final boolean doSetCurrentPlayer = originalGameControllers.isEmpty();
+        originalGameControllers.remove(player);
         originalGameControllers.put(player, gameController);
+        gameControllers.remove(player);
         gameControllers.put(player, gameController);
         if (doSetCurrentPlayer) {
             setCurrentPlayer(player);