diff options
Diffstat (limited to 'src/jrummikub/control/network/NetworkTurnControl.java')
| -rw-r--r-- | src/jrummikub/control/network/NetworkTurnControl.java | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/jrummikub/control/network/NetworkTurnControl.java b/src/jrummikub/control/network/NetworkTurnControl.java index 57851a2..7b0bcbb 100644 --- a/src/jrummikub/control/network/NetworkTurnControl.java +++ b/src/jrummikub/control/network/NetworkTurnControl.java @@ -1,13 +1,13 @@ package jrummikub.control.network; +import jrummikub.control.RoundControl.InvalidTurnInfo; import jrummikub.control.turn.AbstractTurnControl; -import jrummikub.model.IHand; import jrummikub.model.IRoundState; import jrummikub.model.ITable; import jrummikub.util.Event1; import jrummikub.util.IEvent1; import jrummikub.util.IListener1; -import jrummikub.util.IListener3; +import jrummikub.util.IListener2; public class NetworkTurnControl extends AbstractTurnControl { private IConnectionControl connectionControl; @@ -31,20 +31,24 @@ public class NetworkTurnControl extends AbstractTurnControl { } })); connections.add(connectionControl.getTurnEndEvent().add( - new IListener3<IHand, ITable, ITable>() { + new IListener2<IRoundState, InvalidTurnInfo>() { @Override - public void handle(IHand oldHand, ITable oldTable, ITable newTable) { - endOfTurn(oldHand, oldTable, newTable); + public void handle(IRoundState state, + InvalidTurnInfo invalidTurnInfo) { + NetworkControl.fixGameSettings(state.getGameSettings(), + connectionControl.getNickname()); + + endOfTurn(state, invalidTurnInfo); } })); timer.startTimer(); } - private void endOfTurn(IHand oldHand, ITable oldTable, ITable newTable) { + private void endOfTurn(IRoundState roundState, InvalidTurnInfo invalidTurnInfo) { cleanUp(); - endOfTurnEvent.emit(oldHand, oldTable, newTable); + endOfTurnEvent.emit(roundState, invalidTurnInfo); } @Override |