Updated the Quit button to quit more effiecently

Author: redomar

src/com/redomar/game/Game.java

@@ -74,7 +74,7 @@ public class Game extends Canvas implements Runnable {
 	private boolean notActive = true;
 	private boolean noAudioDevice = false;
 	private int trigger = 0;
-	private GameClient socketClient;
+	private static GameClient socketClient;
 	private GameServer socketServer;
 	private Printing print = new Printing();
 
@@ -327,20 +327,20 @@ public static void main(String[] args) {
 		new Menu().start();
 	}
 
-	public JFrame getFrame() {
-		return frame;
+	public static JFrame getFrame() {
+		return Game.frame;
 	}
 
-	public void setFrame(JFrame frame) {
+	public static void setFrame(JFrame frame) {
 		Game.frame = frame;
 	}
 
-	public GameClient getSocketClient() {
+	public static GameClient getSocketClient() {
 		return socketClient;
 	}
 
 	public void setSocketClient(GameClient socketClient) {
-		this.socketClient = socketClient;
+		Game.socketClient = socketClient;
 	}
 
 	public static Player getPlayer() {

src/com/redomar/game/InputHandler.java

@@ -3,14 +3,9 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 
-import com.redomar.game.net.packets.Packet01Disconnect;
-
 public class InputHandler implements KeyListener {
-	
-	private final Game game;
 
 	public InputHandler(Game game) {
-		this.game = game;
 		game.addKeyListener(this);
 	}
 
@@ -98,8 +93,9 @@ public void toggleKey(int keyCode, boolean isPressed) {
 			}
 		}
 		if (keyCode == KeyEvent.VK_Q){
-			Packet01Disconnect packet = new Packet01Disconnect(Game.getPlayer().getUsername());
-			packet.writeData(this.game.getSocketClient());
+			Game.getLevel().removeEntity(Game.getPlayer().getSantizedUsername());
+			Game.setRunning(false);
+			Game.getFrame().dispose();
 			System.exit(1);
 		}
 	}

src/com/redomar/game/WindowHandler.java

@@ -7,11 +7,12 @@
 
 public class WindowHandler implements WindowListener {
 
+	@SuppressWarnings("unused")
 	private final Game game;
 
 	public WindowHandler(Game game) {
 		this.game = game;
-		this.game.getFrame().addWindowListener(this);
+		Game.getFrame().addWindowListener(this);
 	}
 
 	@Override
@@ -28,7 +29,7 @@ public void windowClosed(WindowEvent event) {
 	public void windowClosing(WindowEvent event) {
 		Packet01Disconnect packet = new Packet01Disconnect(Game.getPlayer()
 				.getUsername());
-		packet.writeData(this.game.getSocketClient());
+		packet.writeData(Game.getSocketClient());
 	}
 
 	@Override

src/com/redomar/game/entities/Player.java

@@ -57,7 +57,8 @@ public void tick() {
 			Packet02Move packet = new Packet02Move(this.getUsername(),
 					this.getX(), this.getY(), this.numSteps, this.isMoving,
 					this.movingDir);
-			packet.writeData(Game.getGame().getSocketClient());
+			Game.getGame();
+			packet.writeData(Game.getSocketClient());
 
 		} else {
 			isMoving = false;

src/com/redomar/game/level/LevelHandler.java

@@ -9,10 +9,12 @@
 
 import javax.imageio.ImageIO;
 
+import com.redomar.game.Game;
 import com.redomar.game.entities.Entity;
 import com.redomar.game.entities.PlayerMP;
 import com.redomar.game.gfx.Screen;
 import com.redomar.game.level.tiles.Tile;
+import com.redomar.game.net.packets.Packet01Disconnect;
 
 public class LevelHandler {
 
@@ -164,6 +166,8 @@ public void removeEntity(String username) {
 			index++;
 		}
 		this.getEntities().remove(index);
+		Packet01Disconnect packet = new Packet01Disconnect(Game.getPlayer().getUsername());
+		packet.writeData(Game.getSocketClient());
 	}
 
 	private int getPlayerMPIndex(String username) {