update

Author: mikyll

bin/networking/IServer.class

@@ -5,8 +5,8 @@
 public interface IServer {
 	public void sendChatMessage(String content);
 	public void sendKickUser(String nickname);
-	public void sendClose();
-	public boolean checkCanStartGame();
 	public User sendBanUser(String banNickname);
 	public boolean removeBan(String address);
+	public boolean checkCanStartGame();
+	public void sendClose();
 }

bin/networking/ServerStream.class

@@ -365,38 +365,6 @@ public void sendKickUser(String kickNickname)
 		}
 	}
 
-	@Override
-	public void sendClose()
-	{
-		Message msg = new Message(MessageType.DISCONNECT, controller.getCurrentTimestamp(), this.nickname, "Server room closed");
-
-		// send the message to each user except the server (NB: it's not a normal sendMessage
-		for(int i = 1; i < this.users.size(); i++)
-		{
-			msg.setNickname(this.users.get(i).getNickname());
-			try {
-				this.writers.get(i).writeObject(msg);
-			} catch (IOException e) {
-				// remove the writer at index i?
-				e.printStackTrace();
-			}
-		}
-		
-		// close the socket
-		this.serverListener.closeSocket();
-	}
-	
-	@Override
-	public boolean checkCanStartGame()
-	{
-		for(User u : this.users)
-		{
-			if(!u.isReady())
-				return false;
-		}
-		return this.users.size() >= this.minToStartGame ? true : false;
-	}
-	
 	@Override
 	public User sendBanUser(String banNickname)
 	{
@@ -445,6 +413,38 @@ public boolean removeBan(String address)
 		return false;
 	}
 
+	@Override
+	public boolean checkCanStartGame()
+	{
+		for(User u : this.users)
+		{
+			if(!u.isReady())
+				return false;
+		}
+		return this.users.size() >= this.minToStartGame ? true : false;
+	}
+	
+	@Override
+	public void sendClose()
+	{
+		Message msg = new Message(MessageType.DISCONNECT, controller.getCurrentTimestamp(), this.nickname, "Server room closed");
+
+		// send the message to each user except the server (NB: it's not a normal sendMessage
+		for(int i = 1; i < this.users.size(); i++)
+		{
+			msg.setNickname(this.users.get(i).getNickname());
+			try {
+				this.writers.get(i).writeObject(msg);
+			} catch (IOException e) {
+				// remove the writer at index i?
+				e.printStackTrace();
+			}
+		}
+		
+		// close the socket
+		this.serverListener.closeSocket();
+	}
+	
 	private void forwardMessage(Message msg)
 	{
 		// forward the message to each connected client, except the one that sent the message first