From d66d73ea8f9d660d14e3ef80e716ac1628704fe4 Mon Sep 17 00:00:00 2001 From: Jannis Harder Date: Mon, 30 May 2011 21:04:43 +0200 Subject: Fixed out of stones rules git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@331 72836036-5685-4462-b002-a69064685172 --- src/jrummikub/control/RoundControl.java | 3 ++- test/jrummikub/control/RoundControlTest.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/jrummikub/control/RoundControl.java b/src/jrummikub/control/RoundControl.java index e1d2e97..5874532 100644 --- a/src/jrummikub/control/RoundControl.java +++ b/src/jrummikub/control/RoundControl.java @@ -165,7 +165,8 @@ public class RoundControl { if (roundState.getLastPlayer() == null) { if (roundState.getGameHeap().getSize() == 0) { - roundState.setLastPlayer(roundState.getNthNextPlayer(-1)); + roundState.setLastPlayer(roundState.getNthNextPlayer(0)); + roundState.nextPlayer(); roundState.nextTurn(); } else { roundState.nextPlayer(); diff --git a/test/jrummikub/control/RoundControlTest.java b/test/jrummikub/control/RoundControlTest.java index 8c8c67d..fd2d3fb 100644 --- a/test/jrummikub/control/RoundControlTest.java +++ b/test/jrummikub/control/RoundControlTest.java @@ -771,7 +771,7 @@ public class RoundControlTest { view.startTurnEvent.emit(); view.playerPanel.endTurnEvent.emit(); // player 1 draws a card here - assertSame(player1, roundState.getActivePlayer()); + assertSame(player1, roundState.getNthNextPlayer(-1)); for (int i = 0; i < 4; i++) { view.startTurnEvent.emit(); -- cgit v1.2.3