adjusted the way the server is receiving key presses to enable them be passed through to the game state #pair[ptg19, wmu16] #story[989]

src/main/java/seng302/gameServer/ServerToClientThread.java

@@ -1,12 +1,13 @@
 package seng302.gameServer;
 
+
 import java.util.Random;
-import seng302.gameServer.GameState;
+import seng302.client.ClientPacketParser;
 import seng302.models.Player;
 import seng302.models.Yacht;
-import seng302.models.stream.PacketBufferDelegate;
-import seng302.models.stream.StreamParser;
+import seng302.models.stream.packets.PacketType;
 import seng302.models.stream.packets.StreamPacket;
+import seng302.server.messages.BoatActionType;
 import seng302.server.messages.Message;
 
 import java.io.*;
@@ -21,7 +22,6 @@ import seng302.utilities.GeoPoint;
  * Created by wmu16 on 13/07/17.
  */
 public class ServerToClientThread extends Thread {
-
     private static final Integer MAX_ID_ATTEMPTS = 10;
 
     private InputStream is;
@@ -34,7 +34,8 @@ public class ServerToClientThread extends Thread {
     private Boolean connected = true;
     private Boolean updateClient = true;
 
-    private Integer mockId = 100;
+    private Integer sourceId;
+
     public ServerToClientThread(Socket socket) {
         this.socket = socket;
         try {
@@ -45,8 +46,9 @@ public class ServerToClientThread extends Thread {
         }
 //                threeWayHandshake();
         GameState.addPlayer(new Player(socket));
-        GameState.addYacht(mockId, new Yacht("Kappa", "Kap", new GeoPoint(0.0, 0.0), 0.0));
-        mockId += 1;
+        Random rand = new Random();
+        sourceId = rand.nextInt(100000);
+        GameState.addYacht(sourceId, new Yacht("Kappa", "Kap", new GeoPoint(0.0, 0.0), 0.0));
     }
 
     public void run() {
@@ -85,8 +87,14 @@ public class ServerToClientThread extends Thread {
                     long packetCrc = Message.bytesToLong(getBytes(4));
                     if (computedCrc == packetCrc) {
                         //System.out.println("RECEIVED A PACKET");
-                        StreamParser.parsePacket(new StreamPacket(type, payloadLength, timeStamp, payload));
-                        // TODO: 17/07/17 wmu16 - Fix this or maybe we dont need to go through the main server at all!?!?
+                        switch (PacketType.assignPacketType(type)) {
+                            case BOAT_ACTION:
+                                BoatActionType actionType = ServerPacketParser
+                                    .extractBoatAction(
+                                        new StreamPacket(type, payloadLength, timeStamp, payload));
+                                GameState.updateBoat(sourceId, actionType);
+                                break;
+                        }
                     } else {
                         System.err.println("Packet has been dropped");
                     }