From 3f9f6f9e063fd9fab30de803a8b336e3e25242f8 Mon Sep 17 00:00:00 2001 From: gggdttt Date: Sun, 1 May 2022 17:33:06 +0200 Subject: [PATCH] bug fixed --- src/main/java/controller/game/GameManager.java | 5 +++-- src/main/java/gui/game/InfoPanel.java | 15 +++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/controller/game/GameManager.java b/src/main/java/controller/game/GameManager.java index 86f5409..33b4e42 100644 --- a/src/main/java/controller/game/GameManager.java +++ b/src/main/java/controller/game/GameManager.java @@ -417,6 +417,7 @@ private Timer invokeActivationPhaseTimer(GamePanel gamePanel) { gamePanel.getMatPanel().getLblDiscardCards().setText("Discard Pile: " + game.getUser().getDiscardPile().getDiscards().size()); } + gamePanel.getInfoPanel().updateParticipantsInfo(registerIndex,currentPlayer); for (Player player: game.getParticipants()){ gamePanel.getBoardPanel().getBoard()[player.getRobot().getPosition().getRow()][player.getRobot().getPosition().getCol()].setRobot(player.getRobot().getOrientation(), player); } @@ -438,9 +439,9 @@ private Timer invokeActivationPhaseTimer(GamePanel gamePanel) { } } - gamePanel.getInfoPanel().updateParticipantsInfo(registerIndex--,currentPlayer); + if (registerIndex == RegisterArea.REGISTER_QUEUE_SIZE) { - gamePanel.getInfoPanel().removeCradInfo(currentPlayer); + gamePanel.getInfoPanel().removeCardInfo(); // one round finish game.setCurrentRoundNum(++round); game.setCurrentRegisterNum(0); diff --git a/src/main/java/gui/game/InfoPanel.java b/src/main/java/gui/game/InfoPanel.java index 0d71cad..36aa600 100644 --- a/src/main/java/gui/game/InfoPanel.java +++ b/src/main/java/gui/game/InfoPanel.java @@ -103,15 +103,14 @@ public void updateParticipantsInfo(int register, Player player) { } } - public void removeCradInfo(Player player) { + public void removeCardInfo() { for (ParticipantInfoPanel participantInfoPanel : participantsPanels) { - if (player.getName().equals(participantInfoPanel.getLabelUserName().getText())) { - participantInfoPanel.getRegisters()[0].setText("NaN"); - participantInfoPanel.getRegisters()[1].setText("NaN"); - participantInfoPanel.getRegisters()[2].setText("NaN"); - participantInfoPanel.getRegisters()[3].setText("NaN"); - participantInfoPanel.getRegisters()[4].setText("NaN"); - } + participantInfoPanel.getRegisters()[0].setText("NaN"); + participantInfoPanel.getRegisters()[1].setText("NaN"); + participantInfoPanel.getRegisters()[2].setText("NaN"); + participantInfoPanel.getRegisters()[3].setText("NaN"); + participantInfoPanel.getRegisters()[4].setText("NaN"); + } } }