Added exception when server crashed/closed

server/server/LevelReader.java

@@ -15,7 +15,7 @@ public class LevelReader {
 
 	public static ArrayList<Level> readLevelsFromFiles(){
 		ArrayList<Level> levels = new ArrayList<Level>();
-		File root = new File(Main.class.getResource("/model/levels").getPath());
+		File root = new File(Main.class.getResource("/server/match/levels").getPath());
         File[] list = root.listFiles();
         for ( File f : list ) {
         	if(f.isFile() && f.getName().endsWith(".bb")){

src/model/NetworkConnection.java

@@ -13,9 +13,10 @@ import model.state.PlayState;
 
 public class NetworkConnection {
 	private static final int port = 1234;
-	private static final String address = "localhost";
+	private static final String address = "jancokock.me";
 	private DataOutputStream dout;
 	private DataInputStream din;
+	private Thread receivethread;
 	private PlayState play;
 		
 	public NetworkConnection(PlayState play){
@@ -30,15 +31,15 @@ public class NetworkConnection {
 		dout = new DataOutputStream(server.getOutputStream());
 		din = new DataInputStream(server.getInputStream());
 		dout.writeUTF(name);
-		new Thread(new Runnable() {
+		receivethread = new Thread(new Runnable() {
 			@Override
 			public void run() {
 				while(true){
 					receiveMessage();
 				}
 			}
-		}).start();
-		
+		});
+		receivethread.start();		
 	}
 	
 	public boolean checkConnection(){
@@ -55,7 +56,7 @@ public class NetworkConnection {
 	private void receiveMessage(){
 		try {
 			String message = din.readUTF();
-			String[] messagesplit = message.split("\\|");
+			String[] messagesplit = message.split("\\|"); //2
 			switch (messagesplit[0]){
 				case "1":												//New Match
 					play.newMatch(messagesplit[1], messagesplit[2]);
@@ -82,7 +83,8 @@ public class NetworkConnection {
 					
 			}
 		} catch (IOException e) {
-			e.printStackTrace();
+			System.err.println("Connection to server closed");
+			receivethread.stop();
 		}
 		
 	}
@@ -95,7 +97,8 @@ public class NetworkConnection {
 		try {
 			dout.writeUTF(m);
 		} catch (IOException e) {
-			e.printStackTrace();
+			System.err.println("Connection to server closed");
+			
 		}
 	}
 	

src/model/levels/Level.java

@@ -1,44 +0,0 @@
-package model.levels;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import model.objects.Ball;
-import model.objects.PowerUp;
-
-public class Level {
-	private List<Ball> startballs;
-	private List<PowerUp> powerups;
-	private int time;
-	
-	public Level(){
-		this.startballs = new ArrayList<Ball>();
-		this.powerups = new ArrayList<PowerUp>();
-	}
-	
-	public void addBall(Ball b){
-		startballs.add(b);
-	}
-	
-	public void addPowerUp(PowerUp p){
-		powerups.add(p);
-	}
-	
-	public void setTime(int t){
-		time = t;
-	}
-
-	public List<Ball> getStartballs() {
-		return startballs;
-	}
-
-	public List<PowerUp> getPowerups() {
-		return powerups;
-	}
-
-	public int getTime() {
-		return time;
-	}
-	
-	
-}

src/model/levels/level1.bb

@@ -1,3 +0,0 @@
-2,200,red,200,400,-1,0.0
-speed
-18000

src/model/levels/level2.bb

@@ -1,3 +0,0 @@
-2,200,green,200,200,-1,0.0|3,300,magenta,500,200,1,0.0
-speed|life
-30000