From 121583eb65a4fe05e18fcd06ed8cb8fca21b4792 Mon Sep 17 00:00:00 2001 From: Dennis Weinberger Date: Tue, 26 Mar 2019 19:32:46 +0000 Subject: [PATCH] =?UTF-8?q?=C2=BF=3F=C2=BF=3F=C2=BF=3F=C2=BF=3F=C2=BF=3F?= =?UTF-8?q?=C2=BF=3F=C2=BF=3F=C2=BF=3F=C2=BF=3F=C2=BF=3F=C2=BF=3F=C2=BF=3F?= =?UTF-8?q?=C2=BF=3F=C2=BF=3F=C2=BF=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Projektgruppe_175/src/gui/components/JokerPanel.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Projektgruppe_175/src/gui/components/JokerPanel.java b/Projektgruppe_175/src/gui/components/JokerPanel.java index 5940b7e..2bea02c 100644 --- a/Projektgruppe_175/src/gui/components/JokerPanel.java +++ b/Projektgruppe_175/src/gui/components/JokerPanel.java @@ -84,7 +84,6 @@ public class JokerPanel extends JPanel implements MouseListener{ * @param j The new joker */ private void setJoker(int index, JokerTypes j) { - jokers[index] = j; game.getCurrentPlayer().setJoker(index, j); } @@ -106,7 +105,7 @@ public class JokerPanel extends JPanel implements MouseListener{ if(choice == 1) return; game.getCurrentPlayer().addTroops(5); - game.getCurrentPlayer().setJoker(index, JokerTypes.ADD_TROOPS_USED); + jokers[0] = JokerTypes.ADD_TROOPS_USED; gv.updateStats(); gv.repaint(); } @@ -121,8 +120,9 @@ public class JokerPanel extends JPanel implements MouseListener{ return; map.setIsChoosingJoker(true); - game.getCurrentPlayer().setJoker(index, JokerTypes.SCARE_TROOPS_USED); - + game.getCurrentPlayer().setScareTroopsUsed(); + gv.updateStats(); + gv.repaint(); } }