Skip to content

Commit

Permalink
Merge branch 'master' of github.com:davidroster/cs56-games-client-ser…
Browse files Browse the repository at this point in the history
…ver-v2
  • Loading branch information
davidroster committed Dec 7, 2017
2 parents 77fd81c + 8cde2de commit f65afaf
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
//start a java message server that listens for connections to port X and then connects the client
public abstract class JavaServerTemplate{
//this belongs to the server itself, independent of the chat standards
public static ArrayList<ClientNetworkController> clients;
public static ArrayList<ServiceController> services;
protected static ArrayList<ClientNetworkController> clients;
protected static ArrayList<ServiceController> services;
protected LobbyController lobby;

protected boolean running;
Expand Down

0 comments on commit f65afaf

Please sign in to comment.