Resolved merge issue

Author: redomar

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

@@ -74,21 +74,16 @@ private void parsePacket(byte[] data, InetAddress address, int port) {
 		}
 	}
 
-<<<<<<< HEAD
-	private void handlePacket(Packet02Move packet) {
-		this.game.getLevel().movePlayer(packet.getUsername(), packet.getX(), packet.getY());
-=======
 	private void handleLogin(Packet00Login packet, InetAddress address, int port) {
 		System.out.println("[" + address.getHostAddress() + ":" + port + "] "
 				+ packet.getUsername() + " has joined...");
-		PlayerMP player = new PlayerMP(game.level, packet.getX(), packet.getY(),
+		PlayerMP player = new PlayerMP(game.getLevel(), packet.getX(), packet.getY(),
 				packet.getUsername(), address, port);
-		game.level.addEntity(player);
+		game.getLevel().addEntity(player);
 	}
 
 	private void handleMove(Packet02Move packet) {
-		this.game.level.movePlayer(packet.getUsername(), packet.getX(), packet.getY());
->>>>>>> cb07850f2406667c1ba9ade6f1b4aa8531dcdc03
+		this.game.getLevel().movePlayer(packet.getUsername(), packet.getX(), packet.getY());
 	}
 
 	public void sendData(byte[] data) {

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

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

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