solved merge problems

2021-12-03 10:09:17 +01:00
parent c45471c337
commit 442cce6761
3 changed files with 21 additions and 31 deletions
@@ -20,8 +20,7 @@ public class Siedler {
                throwDice(game, parser);
                diceThrown = true;
            }
-
-            parser.displayPlayerInfo(game.getCurrentPlayerResource(), game.getCurrentPlayerWinpoints());
+            parser.displayPlayerInfo(game.getCurruntPlayerResource(), game.getCurrentPlayerWinpoints());
            switch (parser.getAction()) {
                case NEXTPLAYER:
                    Config.Faction winner = game.getWinner();