diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8380487..9f0ea26 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,45 +5,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - @@ -66,88 +32,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + - + + - - + + - - - - - - - - - - - - - - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -156,25 +98,46 @@ - - - - - + + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -186,36 +149,36 @@ - m - ti - jo - joinTi - joinTimeo - joinTimeout= - joinTimeout - joinTimeout = - ma - math. - math - matc - match - match.jo - match.joi - match.join - match.joint - j - jin - ji - join - joinTime - joinTimeou - threadPool - 1000 - waiti + waitingforu + waitingfor + waitingfo + waitingf + waiting waiting waiting f - waiting for - waiting for u + G + GAME + GAME_S + GAME_ST + GAME_STA + GAME_STAR + match timeout + timeout canc + GAME_START + TI + TIMEOUT + timeout cancelled + TIMEOUTT + findMath + match.joinTime + ma + match + match. + match.joi + match.join + match.joinT + match.joinTi + match.joinTim C:\Users\loke\TextTwist\out\production @@ -354,6 +317,25 @@ @@ -445,7 +408,7 @@ - + @@ -459,31 +422,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -609,7 +523,7 @@ + @@ -1321,13 +1314,14 @@ - - + + + - @@ -1343,14 +1337,14 @@ - + - + - + @@ -1358,35 +1352,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1406,6 +1376,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1438,9 +1496,13 @@ - - - + + + + + + + @@ -1448,6 +1510,7 @@ + @@ -1491,6 +1554,13 @@ + + + + + + + @@ -1534,307 +1604,206 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - + + - - + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + diff --git a/Client/src/com/texttwist/client/tasks/WaitForPlayers.java b/Client/src/com/texttwist/client/tasks/WaitForPlayers.java index cdc096a..e0dfabb 100644 --- a/Client/src/com/texttwist/client/tasks/WaitForPlayers.java +++ b/Client/src/com/texttwist/client/tasks/WaitForPlayers.java @@ -35,6 +35,8 @@ public class WaitForPlayers extends SwingWorker { while (App.clientTCP.read(buffer) != -1) { String line = new String(buffer.array(), buffer.position(), buffer.remaining()); buffer.clear(); + System.out.println("ASPETTO GAM_STARTED"); + System.out.println(line); if (line.startsWith("MESSAGE")) { buffer.clear(); diff --git a/Server/src/com/texttwist/server/tasks/JoinTimeout.java b/Server/src/com/texttwist/server/tasks/JoinTimeout.java index cf0a0f9..435a4ad 100644 --- a/Server/src/com/texttwist/server/tasks/JoinTimeout.java +++ b/Server/src/com/texttwist/server/tasks/JoinTimeout.java @@ -21,10 +21,10 @@ public class JoinTimeout implements Callable { System.out.println("TIMEOUTTTT"); if(match.joinTimeout) { + match.joinTimeout = false; return false; } else { - match.joinTimeout=true; return true; } } catch (InterruptedException e) { diff --git a/notificationServer.log b/notificationServer.log index 1279a2c..6f5bdbf 100644 --- a/notificationServer.log +++ b/notificationServer.log @@ -1455,3 +1455,73 @@ LOGGER (Server): Thu Jul 13 14:14:30 CEST 2017 - Invoked login with username=asd LOGGER (Server): Thu Jul 13 14:14:30 CEST 2017 - Login successfull LOGGER (Server): Thu Jul 13 14:14:36 CEST 2017 - Invoked login with username=dd AND password=dd LOGGER (Server): Thu Jul 13 14:14:36 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:21:33 CEST 2017 - Services starting ... +LOGGER (Server): Thu Jul 13 15:21:33 CEST 2017 - AuthService Service running at 9999 port... +LOGGER (Server): Thu Jul 13 15:21:33 CEST 2017 - Services started correctly ... +LOGGER (Server): Thu Jul 13 15:21:33 CEST 2017 - GameService Service is running at 10000 port... +LOGGER (Server): Thu Jul 13 15:21:37 CEST 2017 - Invoked login with username=a AND password=a +LOGGER (Server): Thu Jul 13 15:21:37 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:21:43 CEST 2017 - Invoked login with username=b AND password=b +LOGGER (Server): Thu Jul 13 15:21:43 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:22:27 CEST 2017 - Invoked login with username=asd AND password=asd +LOGGER (Server): Thu Jul 13 15:22:27 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:22:30 CEST 2017 - Invoked login with username=dd AND password=dd +LOGGER (Server): Thu Jul 13 15:22:30 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:24:34 CEST 2017 - Services starting ... +LOGGER (Server): Thu Jul 13 15:24:35 CEST 2017 - AuthService Service running at 9999 port... +LOGGER (Server): Thu Jul 13 15:24:35 CEST 2017 - Services started correctly ... +LOGGER (Server): Thu Jul 13 15:24:35 CEST 2017 - GameService Service is running at 10000 port... +LOGGER (Server): Thu Jul 13 15:24:45 CEST 2017 - Invoked login with username=a AND password=a +LOGGER (Server): Thu Jul 13 15:24:45 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:24:48 CEST 2017 - Invoked login with username=b AND password=b +LOGGER (Server): Thu Jul 13 15:24:48 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:24:52 CEST 2017 - Invoked login with username=asd AND password=asd +LOGGER (Server): Thu Jul 13 15:24:52 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:24:58 CEST 2017 - Invoked login with username=dd AND password=dd +LOGGER (Server): Thu Jul 13 15:24:58 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:30:01 CEST 2017 - Services starting ... +LOGGER (Server): Thu Jul 13 15:30:01 CEST 2017 - AuthService Service running at 9999 port... +LOGGER (Server): Thu Jul 13 15:30:01 CEST 2017 - Services started correctly ... +LOGGER (Server): Thu Jul 13 15:30:01 CEST 2017 - GameService Service is running at 10000 port... +LOGGER (Server): Thu Jul 13 15:30:09 CEST 2017 - Invoked login with username=a AND password=a +LOGGER (Server): Thu Jul 13 15:30:09 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:30:16 CEST 2017 - Invoked login with username=b AND password=b +LOGGER (Server): Thu Jul 13 15:30:16 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:30:19 CEST 2017 - Invoked login with username=asd AND password=asd +LOGGER (Server): Thu Jul 13 15:30:19 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:30:22 CEST 2017 - Invoked login with username=dd AND password=dd +LOGGER (Server): Thu Jul 13 15:30:22 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:32:29 CEST 2017 - Services starting ... +LOGGER (Server): Thu Jul 13 15:32:29 CEST 2017 - AuthService Service running at 9999 port... +LOGGER (Server): Thu Jul 13 15:32:30 CEST 2017 - Services started correctly ... +LOGGER (Server): Thu Jul 13 15:32:30 CEST 2017 - GameService Service is running at 10000 port... +LOGGER (Server): Thu Jul 13 15:32:41 CEST 2017 - Invoked login with username=a AND password=a +LOGGER (Server): Thu Jul 13 15:32:41 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:32:42 CEST 2017 - Invoked login with username=b AND password=b +LOGGER (Server): Thu Jul 13 15:32:42 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:32:46 CEST 2017 - Invoked login with username=dd AND password=dd +LOGGER (Server): Thu Jul 13 15:32:46 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:32:52 CEST 2017 - Invoked login with username=asd AND password=asd +LOGGER (Server): Thu Jul 13 15:32:52 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:33:10 CEST 2017 - Invoked register with username=ff AND password=ff +LOGGER (Server): Thu Jul 13 15:33:10 CEST 2017 - Registration successfull +LOGGER (Server): Thu Jul 13 15:33:16 CEST 2017 - Invoked login with username=ff AND password=ff +LOGGER (Server): Thu Jul 13 15:33:16 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:33:28 CEST 2017 - Invoked login with username=ss AND password=ss +LOGGER (Server): Thu Jul 13 15:33:28 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:39:59 CEST 2017 - Services starting ... +LOGGER (Server): Thu Jul 13 15:39:59 CEST 2017 - AuthService Service running at 9999 port... +LOGGER (Server): Thu Jul 13 15:39:59 CEST 2017 - GameService Service is running at 10000 port... +LOGGER (Server): Thu Jul 13 15:39:59 CEST 2017 - Services started correctly ... +LOGGER (Server): Thu Jul 13 15:40:03 CEST 2017 - Invoked login with username=a AND password=a +LOGGER (Server): Thu Jul 13 15:40:03 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:40:11 CEST 2017 - Invoked login with username=b AND password=b +LOGGER (Server): Thu Jul 13 15:40:11 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:40:18 CEST 2017 - Invoked login with username=asd AND password=asd +LOGGER (Server): Thu Jul 13 15:40:18 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:40:22 CEST 2017 - Invoked login with username=dd AND password=dd +LOGGER (Server): Thu Jul 13 15:40:22 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:40:44 CEST 2017 - Invoked login with username=ss AND password=ss +LOGGER (Server): Thu Jul 13 15:40:44 CEST 2017 - Login successfull +LOGGER (Server): Thu Jul 13 15:40:53 CEST 2017 - Invoked login with username=aa AND password=aa +LOGGER (Server): Thu Jul 13 15:40:53 CEST 2017 - Login successfull