From e29c4c3516e64de4d629f15ae4c4bb6fc509845e Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 6 Mar 2016 02:06:10 +0100 Subject: [PATCH] * Fixed that the storm counter was no shown on the game panel. --- Mage.Client/src/main/java/mage/client/game/GamePanel.java | 4 ++-- Mage.Common/src/mage/view/GameView.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java index 597b4c8b90..a340a21153 100644 --- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java +++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java @@ -413,6 +413,8 @@ public final class GamePanel extends javax.swing.JPanel { pnlShortCuts.setMinimumSize(newDimension); pnlShortCuts.setMaximumSize(newDimension); + txtSpellsCast.setFont(new Font(GUISizeHelper.gameDialogAreaFont.getFontName(), Font.BOLD, GUISizeHelper.gameDialogAreaFont.getSize())); + GUISizeHelper.changePopupMenuFont(popupMenuTriggerOrder); } @@ -1259,8 +1261,6 @@ public final class GamePanel extends javax.swing.JPanel { feedbackPanel = new mage.client.game.FeedbackPanel(); txtSpellsCast = new javax.swing.JLabel(); - Font font = new Font("SansSerif", Font.BOLD, 12); - txtSpellsCast.setFont(font); Border paddingBorder = BorderFactory.createEmptyBorder(4, 4, 4, 4); Border border = BorderFactory.createLineBorder(Color.DARK_GRAY, 2); txtSpellsCast.setBorder(BorderFactory.createCompoundBorder(border, paddingBorder)); diff --git a/Mage.Common/src/mage/view/GameView.java b/Mage.Common/src/mage/view/GameView.java index bc0f5dc839..306f40b54c 100644 --- a/Mage.Common/src/mage/view/GameView.java +++ b/Mage.Common/src/mage/view/GameView.java @@ -195,7 +195,7 @@ public class GameView implements Serializable { this.special = false; } - CastSpellLastTurnWatcher watcher = (CastSpellLastTurnWatcher) game.getState().getWatchers().get("CastSpellLastTurnWatcher"); + CastSpellLastTurnWatcher watcher = (CastSpellLastTurnWatcher) game.getState().getWatchers().get(CastSpellLastTurnWatcher.class.getName()); if (watcher != null) { spellsCastCurrentTurn = watcher.getAmountOfSpellsAllPlayersCastOnCurrentTurn(); } else {