michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/gameServer/GameServerThread.java
+1 -1
View File
@@ -18,7 +18,7 @@ import java.util.*;
public class GameServerThread implements Runnable, Observer, ClientConnectionDelegate{
private static final Integer MAX_NUM_PLAYERS = 10;
public static final int PORT_NUMBER = 4950;
public static final int PORT_NUMBER = 4942;
private Boolean hosting = true;
src/main/java/seng302/gameServer/MainServerThread.java
+1 -1
View File
@@ -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;