From ac022e1f7cf4999b2af3037ed0771cb5773090ae Mon Sep 17 00:00:00 2001
From: sebaschi <74497638+sebaschi@users.noreply.github.com>
Date: Fri, 8 Apr 2022 12:47:19 +0200
Subject: [PATCH 1/2] Changed the list in ServerLobby to static, since they are
 global per running server.

---
 .../unibas/dmi/dbis/cs108/sebaschi/ServerLobby.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/sebaschi/ServerLobby.java b/src/main/java/ch/unibas/dmi/dbis/cs108/sebaschi/ServerLobby.java
index 9063170..b4c48f7 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/sebaschi/ServerLobby.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/sebaschi/ServerLobby.java
@@ -1,6 +1,7 @@
 package ch.unibas.dmi.dbis.cs108.sebaschi;
 
 import ch.unibas.dmi.dbis.cs108.multiplayer.server.ClientHandler;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -10,7 +11,15 @@ import java.util.List;
  */
 public class ServerLobby {
 
-  List<Lobby> openLobbies;
-  List<ClientHandler> allClients;
+  private static List<Lobby> openLobbies;
+  private static List<ClientHandler> allClients;
 
+  static {
+    openLobbies = new ArrayList<>();
+    allClients = new ArrayList<>();
+  }
+
+  public static List<Lobby> getOpenLobbies() {
+    return openLobbies;
+  }
 }

From f858c734f73be138bed0c78c4dde2cd90bb5fce6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Seraina=20Sch=C3=B6b?= <seraina.schoeb@unibas.ch>
Date: Fri, 8 Apr 2022 10:58:17 +0000
Subject: [PATCH 2/2] Update Diary.txt

---
 Meilenstein III/Diary.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Meilenstein III/Diary.txt b/Meilenstein III/Diary.txt
index 9b7084e..503348c 100644
--- a/Meilenstein III/Diary.txt	
+++ b/Meilenstein III/Diary.txt	
@@ -241,5 +241,11 @@ ToDo:
 Stand:
 	Server - Client: Connection loss handling funktioniert nun.
 	Lobby: ?
-	Spiellogik:
+	Spiellogik: 	 VoteHandler wurde getestet und tut weitestgehenst was er soll
+
+ToDo:
+	Spiellogik:		 - Send() methode von Passenger mit Client-Server verknüpfen(Seraina)
+					 - NoiseHandler (Alex)
+					 - Game Zyklus implementieren (Seraina)
+