Merge pull request #20 from USTakAssociation/dev

Dev to Main

Author: invaderb

.gitignore

@@ -1 +1,4 @@
-playtakdb/
+playtakdb/
+
+run
+run/**

server/src/main/java/tak/Client.java

@@ -35,7 +35,6 @@ public class Client extends Thread implements Publisher<GameUpdate> {
 	public int protocolVersion=0;
 
 	static AtomicInteger totalClients = new AtomicInteger(0);
-	static AtomicInteger onlineClients = new AtomicInteger(0);
 
 	static ConcurrentHashSet<Client> clientConnections = new ConcurrentHashSet<>();
 	protected ConcurrentHashSet<Subscriber<? super GameUpdate>> subscribers = new ConcurrentHashSet<>();
@@ -304,7 +303,7 @@ void clientQuit() throws IOException {
 			unspectateAll();
 
 			player.loggedOut();
-			sendAllOnline("Online "+onlineClients.decrementAndGet());
+			sendAllOnline("Online "+clientConnections.size());
 		}
 
 		websocket.kill(201);
@@ -406,7 +405,7 @@ else if(player.isLoggedIn()){
 							Seek.registerListener(this);
 							Game.registerGameListListener(player);
 
-							sendAllOnline("Online "+onlineClients.incrementAndGet());
+							sendAllOnline("Online "+clientConnections.size());
 						}
 						finally{
 							Player.loginLock.unlock();
@@ -448,7 +447,7 @@ else if ((m = loginPattern.matcher(temp)).find()) {
 										Seek.registerListener(this);
 										Game.registerGameListListener(player);
 
-										sendAllOnline("Online "+onlineClients.incrementAndGet());
+										sendAllOnline("Online "+clientConnections.size());
 									}
 								} else
 									send("Authentication failure");