Merging game lobby with game state broadcast. Merge conflicts resolved.

Port numbers updated to 4942.
This commit is contained in:
Kusal Ekanayake
2017-07-24 15:26:51 +12:00
parent 1daac842f2
commit 526c12127f
6 changed files with 8 additions and 6 deletions
@@ -17,7 +17,7 @@ import java.util.concurrent.PriorityBlockingQueue;
*/
public class MainServerThread implements Runnable, PacketBufferDelegate, ClientConnectionDelegate{
private static final int PORT = 4950;
private static final int PORT = 4942;
private static final Integer MAX_NUM_PLAYERS = 3;
private static final int LOG_LEVEL = 1;