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

* Fixed a cleanup problem that locked the game at game end. Minor formattings and cleanup additions.

Browse source
This commit is contained in:
LevelX2 2014-02-11 00:38:10 +01:00
parent e672e63736
commit 753ada0a01
13 changed files with 86 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
View file

@ -136,8 +136,8 @@ public class FeedbackPanel extends javax.swing.JPanel {
case END:
this.btnLeft.setVisible(false);
this.btnRight.setVisible(true);
this.btnRight.setText("OK");
this.helper.setState("", false, "OK", true);
this.btnRight.setText("Close game");
this.helper.setState("", false, "Close game", true);
ArrowBuilder.getBuilder().removeAllArrows(gameId);
endWithTimeout();
break;
@ -283,7 +283,10 @@ public class FeedbackPanel extends javax.swing.JPanel {
if (mode == FeedbackMode.SELECT && (evt.getModifiers() & ActionEvent.CTRL_MASK) == ActionEvent.CTRL_MASK) {
session.sendPlayerInteger(gameId, 0);
} else if (mode == FeedbackMode.END) {
MageFrame.getGame(gameId).hideGame();
GamePanel gamePanel = MageFrame.getGame(gameId);
if (gamePanel != null) {
gamePanel.removeGame();
}
} else {
session.sendPlayerBoolean(gameId, false);
}