Server and Client update

Author: redomar

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

@@ -22,7 +22,7 @@ public class GameClient extends Thread {
 	private Game game;
 
 	public GameClient(Game game, String ipAddress) {
-		this.game = game;
+		this.setGame(game);
 		try {
 			this.socket = new DatagramSocket();
 			this.ipAddress = InetAddress.getByName(ipAddress);
@@ -65,7 +65,7 @@ private void parsePacket(byte[] data, InetAddress address, int port) {
 			System.out.println("[" + address.getHostAddress() + ":" + port
 					+ "] " + ((Packet01Disconnect) packet).getUsername()
 					+ " has disconnected...");
-			game.getLevel().removeEntity(
+			Game.getLevel().removeEntity(
 					((Packet01Disconnect) packet).getUsername());
 			break;
 		case MOVE:
@@ -78,13 +78,13 @@ private void parsePacket(byte[] data, InetAddress address, int port) {
 	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(),
+		PlayerMP player = new PlayerMP(Game.getLevel(), packet.getX(),
 				packet.getY(), packet.getUsername(), address, port);
-		game.getLevel().addEntity(player);
+		Game.getLevel().addEntity(player);
 	}
 
 	private void handleMove(Packet02Move packet) {
-		this.game.getLevel().movePlayer(packet.getUsername(), packet.getX(),
+		Game.getLevel().movePlayer(packet.getUsername(), packet.getX(),
 				packet.getY(), packet.getNumSteps(), packet.isMoving(),
 				packet.getMovingDir());
 	}
@@ -99,4 +99,12 @@ public void sendData(byte[] data) {
 		}
 	}
 
+	public Game getGame() {
+		return game;
+	}
+
+	public void setGame(Game game) {
+		this.game = game;
+	}
+
 }

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

@@ -23,7 +23,7 @@ public class GameServer extends Thread {
 	private List<PlayerMP> connectedPlayers = new ArrayList<PlayerMP>();
 
 	public GameServer(Game game) {
-		this.game = game;
+		this.setGame(game);
 		try {
 			this.socket = new DatagramSocket(1331);
 		} catch (SocketException e) {
@@ -66,7 +66,7 @@ private void parsePacket(byte[] data, InetAddress address, int port) {
 			System.out.println("[" + address.getHostAddress() + ":" + port
 					+ "] " + ((Packet00Login) packet).getUsername()
 					+ " has connected...");
-			PlayerMP player = new PlayerMP(game.getLevel(), 10, 10,
+			PlayerMP player = new PlayerMP(Game.getLevel(), 10, 10,
 					((Packet00Login) packet).getUsername(), address, port);
 			this.addConnection(player, (Packet00Login) packet);
 			break;
@@ -162,4 +162,12 @@ public void sendDataToAllClients(byte[] data) {
 			sendData(data, p.ipAddess, p.port);
 		}
 	}
+
+	public Game getGame() {
+		return game;
+	}
+
+	public void setGame(Game game) {
+		this.game = game;
+	}
 }