fixed critical bug where the players folow each other

mumblers · Aug 9, 2015 · 0a92458 · 0a92458
1 parent f8f6087
commit 0a92458
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 15 deletions.
diff --git a/client/src/mumblers/tracers/client/Client.java b/client/src/mumblers/tracers/client/Client.java
@@ -22,7 +22,7 @@ public class Client implements DisplayRenderer, PlayerSupplier {
 
     public static final String TITLE = "TRacers";
 
-    private Player myPlayer = new Player(PlayerColor.BLACK, "Davidot");
+    private Player myPlayer;
     private java.util.List<Player> players = new ArrayList<>();
 
     private Track track = new Track();
@@ -35,8 +35,12 @@ public class Client implements DisplayRenderer, PlayerSupplier {
     private ServerConnection connection;
 
     public Client(String ip) {
+        String playerName = JOptionPane.showInputDialog("Player Name?");
+        myPlayer = new Player(PlayerColor.YELLOW, playerName);
+
         try {
             connection = new ServerConnection(this, ip);
+            connection.sendPlayerConnectMessage();
         } catch (IOException e) {
             e.printStackTrace();
             JOptionPane.showMessageDialog(null, "could not connect to server.");
@@ -68,9 +72,6 @@ public void tick() {
         input.tick();
         playerController.tick();
         connection.sendPlayerUpdate();
-
-        if(getPlayers().size() > 0)
-            System.out.println(getPlayers().get(0).getX());
     }
 
 
@@ -107,4 +108,8 @@ public Player getTrackingPlayer() {
         return myPlayer;
     }
 
+    public static void main(String[] args) {
+        new Client("localhost");
+    }
+
 }
diff --git a/client/src/mumblers/tracers/client/ServerConnection.java b/client/src/mumblers/tracers/client/ServerConnection.java
@@ -34,6 +34,7 @@ public void handlePacket(Packet packet) {
 
     private void handlePlayerColour(Packet packet) {
         PlayerColor playerColor = PlayerColor.values()[Integer.valueOf(packet.getData())];
+        System.out.println("Set color to "  + playerColor.name());
         client.getTrackingPlayer().setColour(playerColor);
     }
 
@@ -60,6 +61,11 @@ private void handlePlayerUpdate(Packet packet) {
 
     public void sendPlayerUpdate() {
         Player player = client.getTrackingPlayer();
-        send(new Packet(PacketId.PLAYER_UPDATE, player.getColor().ordinal() + ";" + player.getX() + ";" +player.getY() + ";" + player.getRotation() + ";" + player.getName()));
+        send(new Packet(PacketId.PLAYER_UPDATE, player.getColor().ordinal() + ";" + player.getX() + ";" + player.getY() + ";" + player.getRotation() + ";" + player.getName()));
+    }
+
+    public void sendPlayerConnectMessage() {
+        Player player = client.getTrackingPlayer();
+        send(new Packet(PacketId.PLAYER_CONNECT, player.getName()));
     }
 }
diff --git a/common/src/mumblers/tracers/common/Game.java b/common/src/mumblers/tracers/common/Game.java
diff --git a/server/src/mumblers/tracers/server/Server.java b/server/src/mumblers/tracers/server/Server.java
@@ -29,7 +29,7 @@ public Server() throws IOException {
         receivers = new ArrayList<>();
         receivers.add(new PlayerConnectReceiver());
         receivers.add(new PlayerUpdateReceiver());
-        availableColours = Arrays.asList(PlayerColor.values());
+        availableColours = new ArrayList<>(Arrays.asList(PlayerColor.values()));
         clients = new ArrayList<>();
     }
 
@@ -48,6 +48,7 @@ public void run() {
                     continue;
                 ClientConnection client = new ClientConnection(this, socket, receivers);
                 clients.add(client);
+                System.out.println("New client connected...");
             } catch (IOException e) {
                 e.printStackTrace();
             }

diff --git a/server/src/mumblers/tracers/server/receivers/PlayerConnectReceiver.java b/server/src/mumblers/tracers/server/receivers/PlayerConnectReceiver.java
@@ -29,7 +29,7 @@ public void onPacket(Connection connection, Player player, Packet packet) {
 
         PlayerColor newColour = clientConnection.getServer().getAvailableColours().remove(0);
         player.setColour(newColour);
-
+        System.out.println("send player color " + newColour.name());
         clientConnection.send(new Packet(PacketId.PLAYER_COLOUR, newColour.ordinal() + ""));
     }