diff options
Diffstat (limited to 'src/jrummikub/control/network/NetworkControl.java')
-rw-r--r-- | src/jrummikub/control/network/NetworkControl.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/jrummikub/control/network/NetworkControl.java b/src/jrummikub/control/network/NetworkControl.java index 0ae3808..0e8381b 100644 --- a/src/jrummikub/control/network/NetworkControl.java +++ b/src/jrummikub/control/network/NetworkControl.java @@ -75,7 +75,7 @@ public class NetworkControl { private void join(GameData gameData) { view.showGameListPanel(false); - connectionControl.joinGame(gameData.getGameID()); + connectionControl.joinGame(gameData); } /** @@ -135,11 +135,11 @@ public class NetworkControl { } })); connections.add(connectionControl.getGameJoinAckEvent().add( - new IListener2<UUID, Boolean>() { + new IListener1<Boolean>() { @Override - public void handle(UUID uuid, Boolean ack) { + public void handle(Boolean ack) { if (ack) { - createGameJoinControl(uuid); + createGameJoinControl(); } else { // TODO Error message view.showGameListPanel(true); @@ -158,12 +158,12 @@ public class NetworkControl { view.getGameListPanel().setGameList(gameList); } - private void createGameJoinControl(UUID uuid) { + private void createGameJoinControl() { if (gameJoinControl != null) { return; } - GameData gameData = gameMap.get(uuid); + GameData gameData = connectionControl.getCurrentGame(); gameJoinControl = new GameJoinControl(connectionControl, gameData, view); gameJoinControl.getBackEvent().add(new IListener() { @Override |