summaryrefslogtreecommitdiffstats
path: root/src/jrummikub/control/network/GameJoinControl.java
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2011-06-21 17:19:28 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2011-06-21 17:19:28 +0200
commitdf535edb70f2734061e466a5ff8c9b7a2896f169 (patch)
treee5173c39fac62f922da2cd6b2318ae35b1e8dd66 /src/jrummikub/control/network/GameJoinControl.java
parent81de4ad99f12511efe6141eba86af8a3439efa30 (diff)
downloadJRummikub-df535edb70f2734061e466a5ff8c9b7a2896f169.tar
JRummikub-df535edb70f2734061e466a5ff8c9b7a2896f169.zip
Fix up GameSettings in ConnectionControl
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@550 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src/jrummikub/control/network/GameJoinControl.java')
-rw-r--r--src/jrummikub/control/network/GameJoinControl.java8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/jrummikub/control/network/GameJoinControl.java b/src/jrummikub/control/network/GameJoinControl.java
index d846ebc..cbdc4de 100644
--- a/src/jrummikub/control/network/GameJoinControl.java
+++ b/src/jrummikub/control/network/GameJoinControl.java
@@ -2,7 +2,6 @@ package jrummikub.control.network;
import java.util.UUID;
-import jrummikub.model.GameSettings;
import jrummikub.util.Event;
import jrummikub.util.GameData;
import jrummikub.util.IEvent;
@@ -31,7 +30,6 @@ public class GameJoinControl extends AbstractGameBeginControl {
final GameData gameData, final IView view) {
super(connectionControl, view, gameData, SettingsMode.NETWORK_JOIN);
- NetworkControl.fixGameSettings(gameData.getGameSettings(), connectionControl.getNickname());
updateSettingsPanel();
connections.add(connectionControl.getGameOfferEvent().add(
@@ -39,11 +37,7 @@ public class GameJoinControl extends AbstractGameBeginControl {
@Override
public void handle(GameData data) {
if (data.getGameID().equals(gameData.getGameID())) {
- GameSettings settings = data.getGameSettings();
-
- NetworkControl.fixGameSettings(settings, connectionControl.getNickname());
-
- gameData.setGameSettings(settings);
+ gameData.setGameSettings(data.getGameSettings());
updateSettingsPanel();
}