Merge commit '0ee1d48df869d95deed48db223d98a9795c635bc'

Author: redomar

src/com/redomar/game/Game.java

@@ -89,8 +89,8 @@ public void init() {
 		setPlayer(new PlayerMP(getLevel(), 100, 100, input,
 				JOptionPane.showInputDialog(this, "Enter a name"), null, -1));
 
-		getLevel().addEntity(getPlayer());
-		Packet00Login loginPacket = new Packet00Login(getPlayer().getUsername());
+		level.addEntity(player);
+		Packet00Login loginPacket = new Packet00Login(player.getUsername(), player.x, player.y);
 
 		if (socketServer != null) {
 			socketServer.addConnection((PlayerMP) getPlayer(), loginPacket);

src/com/redomar/game/net/GameClient.java

@@ -58,12 +58,7 @@ private void parsePacket(byte[] data, InetAddress address, int port) {
 			break;
 		case LOGIN:
 			packet = new Packet00Login(data);
-			System.out.println("[" + address.getHostAddress() + ":" + port
-					+ "] " + ((Packet00Login) packet).getUsername()
-					+ " has joined...");
-			PlayerMP player = new PlayerMP(game.getLevel(), 10, 10,
-					((Packet00Login) packet).getUsername(), address, port);
-			game.getLevel().addEntity(player);
+			handleLogin((Packet00Login)packet, address, port);
 			break;
 		case DISCONNECT:
 			packet = new Packet01Disconnect(data);
@@ -74,12 +69,20 @@ private void parsePacket(byte[] data, InetAddress address, int port) {
 			break;
 		case MOVE:
 			packet = new Packet02Move(data);
-			this.handlePacket((Packet02Move)packet);
+			this.handleMove((Packet02Move)packet);
 			break;
 		}
 	}
 
-	private void handlePacket(Packet02Move packet) {
+	private void handleLogin(Packet00Login packet, InetAddress address, int port) {
+		System.out.println("[" + address.getHostAddress() + ":" + port + "] "
+				+ packet.getUsername() + " has joined...");
+		PlayerMP player = new PlayerMP(game.getLevel(), packet.getX(), packet.getY(),
+				packet.getUsername(), address, port);
+		game.getLevel().addEntity(player);
+	}
+
+	private void handleMove(Packet02Move packet) {
 		this.game.getLevel().movePlayer(packet.getUsername(), packet.getX(), packet.getY());
 	}
 
@@ -92,4 +95,5 @@ public void sendData(byte[] data) {
 			e.printStackTrace();
 		}
 	}
+
 }

src/com/redomar/game/net/GameServer.java

@@ -111,7 +111,7 @@ public void addConnection(PlayerMP player, Packet00Login packet) {
 			} else {
 				sendData(packet.getData(), p.ipAddess, p.port);
 
-				packet = new Packet00Login(p.getUsername());
+				packet = new Packet00Login(p.getUsername(), p.x, p.y);
 				sendData(packet.getData(), player.ipAddess, player.port);
 			}
 		}

src/com/redomar/game/net/packets/Packet00Login.java

@@ -6,20 +6,26 @@
 public class Packet00Login extends Packet {
 
 	private String username;
+	private int x, y;
 
 	public Packet00Login(byte[] data) {
 		super(00);
-		this.username = readData(data);
+		String[] dataArray = readData(data).split(",");
+		this.username = dataArray[0];
+		this.x = Integer.parseInt(dataArray[1]);
+		this.y = Integer.parseInt(dataArray[2]);
 	}
 
-	public Packet00Login(String username) {
+	public Packet00Login(String username, int x, int y) {
 		super(00);
 		this.username = username;
+		this.x = x;
+		this.y = y;
 	}
 
 	@Override
 	public byte[] getData() {
-		return ("00" + this.username).getBytes();
+		return ("00" + this.username + "," + getX() + "," + getY()).getBytes();
 	}
 
 	@Override
@@ -35,4 +41,12 @@ public void writeData(GameServer server) {
 	public String getUsername() {
 		return username;
 	}
+
+	public int getX() {
+		return this.x;
+	}
+
+	public int getY() {
+		return this.y;
+	}
 }

src/com/redomar/game/net/packets/Packet02Move.java

@@ -25,7 +25,7 @@ public Packet02Move(String username, int x, int y) {
 
 	@Override
 	public byte[] getData() {
-		return ("02" + this.username + "," + this.x + "," + this.y).getBytes();
+		return ("02" + this.username + "," + getX() + "," + getY()).getBytes();
 	}
 
 	@Override