diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/LoadingScreenController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/LoadingScreenController.java index 9c3db0597ec76ba2dd675171be9e7e680a6a9897..732adab8d9419b6ceb9c141b267e8de39f590c0b 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/LoadingScreenController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/LoadingScreenController.java @@ -60,7 +60,9 @@ public class LoadingScreenController implements Initializable { "Jonas is the original Thread Ripper.", "AMD is gonna name their next CPU after Jonas.", "Start of Explosions spawning after bomb first explodes, not at the same time anymore, finally. - Yannik", - "Update: Classes for Clean Codecand TODOS as problems - Yannik" + "Update: Classes for Clean Codecand TODOS as problems - Yannik", + "Let's see, if Peter finds out, that we added this line to his code.", + "Contrary to popular belief, the word 'playcement' is written with an y." }; private final List<String> shuffledTips = Arrays.asList(loadingTips); @@ -133,6 +135,12 @@ public class LoadingScreenController implements Initializable { if (runtimeInfo.getGameMode() != GameMode.NETWORK) { thread1.start(); waitingForThread1.start(); // basically thread1.join() but making it in separate thread otherwise it will block JavaFX thread + try { + log.debug("Executing waitingForThread2"); + thread2.join(); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } loadStatistics.start(); } else { multiplayerLoadingScreenThread.start(); diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java index f127303eda39038e0983eee63a4cf4b40fa1afac..b744f94044fe0effb18e340486abc5465dc68b6b 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java @@ -48,7 +48,7 @@ public class RuntimeInfo { //multiplayer private Server server; private ConnectionHandler connectionHandler; - private boolean gameWon = true; + private boolean gameWon = false; //multiplayerID private int playerID; @@ -87,7 +87,7 @@ public class RuntimeInfo { deaths = 0; blocksDestroyed = 0; gameTime = 0; - gameWon = true; + gameWon = false; } public GameState getGameState() { diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ThreadUpdateStats.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ThreadUpdateStats.java index a29f9d7d03b53ee32eaff9ca17463c2796fe3e07..b5f93bd9ba1f9daec01bd08bdc5bdf660cfbea26 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ThreadUpdateStats.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ThreadUpdateStats.java @@ -18,11 +18,7 @@ public class ThreadUpdateStats extends Thread{ threadsInstance.setThreadUpdateStatsMsg(""); threadsInstance.setThreadUpdateStats(ThreadStatus.RUNNING); persistenceInst.updatePlayerStatistics(runtimeInfoInst.getKills(), runtimeInfoInst.getDeaths(), runtimeInfoInst.getGameTime(), runtimeInfoInst.getBlocksDestroyed(), runtimeInfoInst.isGameWon()); - runtimeInfoInst.setKills(0); - runtimeInfoInst.setDeaths(0); - runtimeInfoInst.setGameTime(0); - runtimeInfoInst.setBlocksDestroyed(0); - runtimeInfoInst.setGameWon(false); + runtimeInfoInst.resetGameStats(); log.info("Update statistics thread finished successfully!"); threadsInstance.setThreadUpdateStats(ThreadStatus.FINISHED); } catch (Exception e) {