summaryrefslogtreecommitdiffstats
path: root/src/jrummikub/control/RoundControl.java
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2011-06-21 01:24:10 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2011-06-21 01:24:10 +0200
commit0b1151e6af8ce156d4ad5d6153cb5a02e99329d7 (patch)
treecd2b3e1ac7018028141fafde3c3c358c7574673c /src/jrummikub/control/RoundControl.java
parent2f08091b65fdff96d3671549e74384ec8306668d (diff)
downloadJRummikub-0b1151e6af8ce156d4ad5d6153cb5a02e99329d7.tar
JRummikub-0b1151e6af8ce156d4ad5d6153cb5a02e99329d7.zip
Fix network mode
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@521 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src/jrummikub/control/RoundControl.java')
-rw-r--r--src/jrummikub/control/RoundControl.java14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/jrummikub/control/RoundControl.java b/src/jrummikub/control/RoundControl.java
index aeff095..71980e1 100644
--- a/src/jrummikub/control/RoundControl.java
+++ b/src/jrummikub/control/RoundControl.java
@@ -264,7 +264,7 @@ public class RoundControl {
return TurnControlFactory.getFactory(type).create();
}
- void deal() {
+ protected void deal() {
for (int i = 0; i < roundState.getPlayerCount(); i++) {
IHand hand = roundState.getNthNextPlayer(i).getHand();
for (int j = 0; j < roundState.getGameSettings().getNumberOfStonesDealt(); j++) {
@@ -276,8 +276,9 @@ public class RoundControl {
}
protected void endOfTurn(InvalidTurnInfo invalidTurnInfo) {
- boolean wasHuman = (turnControl instanceof HumanTurnControl);
- boolean wasAI = (turnControl instanceof AIControl);
+ boolean wasAI = turnControl instanceof AIControl;
+ boolean wasHuman = turnControl instanceof HumanTurnControl;
+
turnControl = null;
view.getTablePanel().setStoneSets(invalidTurnInfo.getTable());
@@ -314,10 +315,13 @@ public class RoundControl {
}
view.setBottomPanel(BottomPanelType.NONHUMAN_HAND_PANEL);
- nextPlayer();
+
+ if (wasHuman || wasAI) {
+ nextPlayer();
+ }
}
- private void nextPlayer() {
+ protected void nextPlayer() {
view.setSelectedStones(Collections.<Stone> emptyList());
view.setInvalidStoneSets(Collections.<StoneSet> emptyList());
view.setStoneCollectionHidden(false);