diff --git a/Mage.Client/src/main/java/mage/client/components/MageTextArea.java b/Mage.Client/src/main/java/mage/client/components/MageTextArea.java index 61e9543703e..923315b7f0a 100644 --- a/Mage.Client/src/main/java/mage/client/components/MageTextArea.java +++ b/Mage.Client/src/main/java/mage/client/components/MageTextArea.java @@ -42,7 +42,7 @@ public class MageTextArea extends JEditorPane { text = text.replaceAll("#([^#]+)#", "$1"); text = text.replaceAll("\\s*//\\s*", "
"); text = text.replace("\r\n", "
"); - text += "
"; + //text += "
"; if (text.length() > 0) { //buffer.append("
"); 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 d216c73f549..9e330ba960f 100644 --- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java +++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java @@ -214,8 +214,8 @@ public class GamePanel extends javax.swing.JPanel { DialogManager.getManager().setScreenHeight(rect.height); DialogManager.getManager().setBounds(0, 0, rect.width, rect.height); - //helper.setPreferredSize(new Dimension(rect.width, 80)); - //helper.setMaximumSize(new Dimension(rect.width, 80)); + //helper.setPreferredSize(new Dimension(rect.width, 90)); + //helper.setMaximumSize(new Dimension(rect.width, 90)); } public synchronized void showGame(UUID gameId, UUID playerId) { @@ -556,7 +556,16 @@ public class GamePanel extends javax.swing.JPanel { public void select(String message, GameView gameView) { updateGame(gameView); - this.feedbackPanel.getFeedback(FeedbackMode.SELECT, message, gameView.getSpecial(), null); + String messageToDisplay = message; + for (PlayerView playerView : gameView.getPlayers()) { + if (playerView.getPlayerId().equals(playerId)) { + if (playerView.isActive()) { + messageToDisplay = message + "
Your turn
"; + } + break; + } + } + this.feedbackPanel.getFeedback(FeedbackMode.SELECT, messageToDisplay, gameView.getSpecial(), null); if (PhaseManager.getInstance().isSkip(gameView, message)) { this.feedbackPanel.doClick(); } @@ -872,7 +881,7 @@ public class GamePanel extends javax.swing.JPanel { pnlReplay.setOpaque(false); helper = new HelperPanel(); - helper.setPreferredSize(new Dimension(100, 80)); + helper.setPreferredSize(new Dimension(100, 90)); helper.addEndTurnListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent e) {