Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

GUI: fixed empty battlefield/players after reconnection, if it still empties then press any skip button (closes #11201)

Browse source
This commit is contained in:
Oleg Agafonov 2023-11-29 03:02:47 +04:00
parent 9322c13926
commit 491c9cbe04
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage.Client/src/main/java/mage/client/game/GamePanel.java
View file

@ -632,7 +632,7 @@ public final class GamePanel extends javax.swing.JPanel {
} }
} }
public synchronized void init(int messageId, GameView game) { public synchronized void init(int messageId, GameView game, boolean callGameUpdateAfterInit) {
addPlayers(game); addPlayers(game);
// default menu states // default menu states
setMenuStates( setMenuStates(
@ -642,8 +642,10 @@ public final class GamePanel extends javax.swing.JPanel {
holdingPriority holdingPriority
); );
if (callGameUpdateAfterInit) {
updateGame(messageId, game); updateGame(messageId, game);
} }
}
private void addPlayers(GameView game) { private void addPlayers(GameView game) {
this.players.clear(); this.players.clear();
@ -773,6 +775,12 @@ public final class GamePanel extends javax.swing.JPanel {
public synchronized void updateGame(int messageId, GameView game, boolean showPlayable, Map<String, Serializable> options, Set<UUID> targets) { public synchronized void updateGame(int messageId, GameView game, boolean showPlayable, Map<String, Serializable> options, Set<UUID> targets) {
keepLastGameData(messageId, game, showPlayable, options, targets); keepLastGameData(messageId, game, showPlayable, options, targets);
if (this.players.isEmpty() && !game.getPlayers().isEmpty()) {
logger.warn("Found empty players list, trying to init game again (possible reason: reconnection)");
init(messageId, game, false);
}
prepareSelectableView(); prepareSelectableView();
updateGame(); updateGame();
} }