From 1e6fd1af0973ead7fc3e063138b0e2c87db757a4 Mon Sep 17 00:00:00 2001 From: Michael Rausch Date: Thu, 13 Jul 2017 19:27:47 +1200 Subject: [PATCH] Fixed bug where players were being added to the GameState twice #story[1047] --- src/main/java/seng302/gameServer/ServerListenThread.java | 2 -- src/main/java/seng302/server/messages/Header.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/seng302/gameServer/ServerListenThread.java b/src/main/java/seng302/gameServer/ServerListenThread.java index 4bb8a66b..67ab285c 100644 --- a/src/main/java/seng302/gameServer/ServerListenThread.java +++ b/src/main/java/seng302/gameServer/ServerListenThread.java @@ -28,8 +28,6 @@ public class ServerListenThread extends Thread{ SocketChannel thisClient = socketChannel.accept(); if (thisClient.socket() != null){ Player thisPlayer = new Player(thisClient); - GameState.addPlayer(thisPlayer); - delegate.clientConnected(thisPlayer); } } catch (IOException e) { diff --git a/src/main/java/seng302/server/messages/Header.java b/src/main/java/seng302/server/messages/Header.java index 5690164a..2b520611 100644 --- a/src/main/java/seng302/server/messages/Header.java +++ b/src/main/java/seng302/server/messages/Header.java @@ -37,7 +37,7 @@ public class Header { private void putInBuffer(byte[] bytes, long val){ byte[] tmp = bytes.clone(); Message.reverse(tmp); - + buff.put(tmp); buffPos += tmp.length; buff.position(buffPos);