From fc84f233ecaa3da2f9e9e382fd2993974e81ba36 Mon Sep 17 00:00:00 2001
From: brausjonas <brausjonas@gmail.com>
Date: Sat, 28 Jan 2023 11:32:12 +0100
Subject: [PATCH] Smooth Camera and Room Exist check

---
 .../.idea.FlufflParty/.idea/workspace.xml     |   3 +-
 FlufflParty/Assets/Scenes/Start.unity         |  23 ++++--
 FlufflParty/Assets/Scripts/Client.cs          |  11 ++-
 .../Scripts/Players/NoPlayablePlayer.cs       |  19 +++--
 .../Assets/Scripts/Players/PlayablePlayer.cs  |  25 ++++--
 FlufflParty/Assets/Scripts/Players/Player.cs  |   5 ++
 .../Assets/Scripts/Start/StartHandler.cs      |  22 ++++++
 .../ProjectSettings/ProjectSettings.asset     |   2 +-
 .../ProjectSettings/QualitySettings.asset     |  14 ++--
 .../UserSettings/Layouts/default-2021.dwlt    |  72 +++++++++---------
 Server/.idea/workspace.xml                    |  29 +++----
 Server/out/artifacts/Server_jar/Server.jar    | Bin 7769 -> 7945 bytes
 Server/out/production/Server/Room$1.class     | Bin 2420 -> 2702 bytes
 Server/out/production/Server/Room.class       | Bin 3376 -> 3376 bytes
 Server/out/production/Server/Server$1.class   | Bin 2500 -> 2652 bytes
 Server/out/production/Server/Server.class     | Bin 2454 -> 2454 bytes
 Server/src/Room.java                          |  18 +++++
 Server/src/Server.java                        |  12 ++-
 18 files changed, 172 insertions(+), 83 deletions(-)

diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
index 034c72d..bbc71ec 100644
--- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
+++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
@@ -105,7 +105,8 @@
       <workItem from="1674673452934" duration="3050000" />
       <workItem from="1674687637475" duration="660000" />
       <workItem from="1674838735946" duration="520000" />
-      <workItem from="1674839572534" duration="22597000" />
+      <workItem from="1674839572534" duration="23192000" />
+      <workItem from="1674896945068" duration="4294000" />
     </task>
     <servers />
   </component>
diff --git a/FlufflParty/Assets/Scenes/Start.unity b/FlufflParty/Assets/Scenes/Start.unity
index e1b34f7..56d4712 100644
--- a/FlufflParty/Assets/Scenes/Start.unity
+++ b/FlufflParty/Assets/Scenes/Start.unity
@@ -650,7 +650,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &505032542
 GameObject:
@@ -1230,7 +1230,7 @@ RectTransform:
   - {fileID: 293557777}
   - {fileID: 1780335805}
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1485,7 +1485,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 30.973, y: 49.515, z: 103.288}
 --- !u!1 &1337600622
 GameObject:
@@ -2176,7 +2176,19 @@ MonoBehaviour:
       m_Calls: []
   m_OnValueChanged:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 2045552894}
+        m_TargetAssemblyTypeName: StartHandler, Assembly-CSharp
+        m_MethodName: OnTextHasChanged
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
   m_OnTouchScreenKeyboardStatusChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -2300,7 +2312,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2045552894
 MonoBehaviour:
@@ -2317,6 +2329,7 @@ MonoBehaviour:
   layout1: {fileID: 293557776}
   layout2: {fileID: 1780335804}
   roomCodeEnter: {fileID: 505032544}
+  buttonJoin: {fileID: 1640298562}
 --- !u!1 &2072539372
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/FlufflParty/Assets/Scripts/Client.cs b/FlufflParty/Assets/Scripts/Client.cs
index a56c9d3..48dc947 100644
--- a/FlufflParty/Assets/Scripts/Client.cs
+++ b/FlufflParty/Assets/Scripts/Client.cs
@@ -6,6 +6,7 @@ using System.Net.Sockets;
 using System.Text;
 using System.Threading;
 using UnityEngine;
+using UnityEngine.SceneManagement;
 
 public class Client : MonoBehaviour
 {
@@ -55,6 +56,7 @@ public class Client : MonoBehaviour
                         script.client = this;
                         script.nextField = nextField;
                         script.dice = dice;
+                        script.camera = cam;
                         script.Init();
                     }
                     //player is not playable
@@ -68,6 +70,7 @@ public class Client : MonoBehaviour
                         players[job.data[5]] = script;
                         script.nextField = nextField;
                         script.dice = dice;
+                        script.camera = cam;
                         script.Init();
                     }
                     break;
@@ -84,6 +87,10 @@ public class Client : MonoBehaviour
                 case 4:
                     ((NoPlayablePlayer)players[job.data[1]]).ArrowSelect(job.data[2]);
                     break;
+                case 127:
+                    client.Close();
+                    SceneManager.LoadScene(0, LoadSceneMode.Single);
+                    break;
             }
         }
     }
@@ -105,8 +112,8 @@ public class Client : MonoBehaviour
             }
         }
 
-        cam.transform.parent = players[player].transform;
-        cam.transform.localPosition = new Vector3(-3, 8, 7);
+        // cam.transform.parent = players[player].transform;
+        // cam.transform.localPosition = new Vector3(-3, 8, 7);
     }
 
 
diff --git a/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs
index a5a65d9..a6b3854 100644
--- a/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs
+++ b/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs
@@ -29,6 +29,7 @@ public class NoPlayablePlayer : Player
 
     public void Wurfeln(int wurfelZahl)
     {
+        wurfelt = true;
         this.wurfelZahl = wurfelZahl;
         //nächstes Feld anvisieren
         TargetNextField();
@@ -52,18 +53,21 @@ public class NoPlayablePlayer : Player
         wait = false;
     }
     
-
+    
     private void FixedUpdate()
     {
+        
         if (activated)
         {
+            camera.transform.position = Vector3.SmoothDamp(camera.transform.position, transform.position + cameraOffset, ref velocity, 0.2f);
+            
             if (!wait)
             {
                 //Laufe zum nöchsten Feld, falls noch Züge übrig sind
                 if (interPol < 1 && wurfelZahl > 0)
                 {
                     //delay
-                    if (Time.time - timeSinceWurfeln > 1)
+                    if (Time.time - timeSinceWurfeln > 2)
                     {
                         InterPolerate();
                     }
@@ -82,10 +86,13 @@ public class NoPlayablePlayer : Player
                 //Der Spieler steht gerade
                 else
                 {
-                    //start the dice
-                    dice.transform.position = Vector3.SmoothDamp(dice.transform.position,
-                        transform.position + Vector3.up * 2, ref useLess, 0.2f);
-                    diceScript.StartRandom();
+                    if (!wurfelt)
+                    {
+                        //start the dice
+                        dice.transform.position = Vector3.SmoothDamp(dice.transform.position,
+                            transform.position + Vector3.up * 2, ref useLess, 0.2f);
+                        diceScript.StartRandom();
+                    }
                 }
             }
             else
diff --git a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
index 9e9e8a7..0406b54 100644
--- a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
+++ b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
@@ -18,6 +18,7 @@ public class PlayablePlayer : Player
     
 
     private float timeSinceWurfeln = 0;
+    private float timeSinceStop = 0;
 
     private Vector3 useLess = new Vector3();
 
@@ -59,13 +60,15 @@ public class PlayablePlayer : Player
     {
         if (activated)
         {
+            camera.transform.position = Vector3.SmoothDamp(camera.transform.position, transform.position + cameraOffset, ref velocity, 0.2f);
+            
             if (!wait)
             {
                 //Laufe zum nöchsten Feld, falls noch Züge übrig sind
                 if (interPol < 1 && wurfelZahl > 0)
                 {
                     //delay
-                    if (Time.time - timeSinceWurfeln > 1)
+                    if (Time.time - timeSinceWurfeln > 2)
                     {
                         InterPolerate();
                     }
@@ -84,17 +87,19 @@ public class PlayablePlayer : Player
                 //Der Spieler steht gerade
                 else
                 {
-                    //start the dice
-                    dice.transform.position = Vector3.SmoothDamp(dice.transform.position,
-                        transform.position + Vector3.up * 2, ref useLess, 0.2f);
-                    diceScript.StartRandom();
-
                     //TODO: temp spieler finsihed erst, wenn field action ausgeführt wurde
                     if (wurfelt)
                     {
-                        client.SendFinished();
+                        Invoke("Finish", 2);
                         activated = false;
                     }
+                    else
+                    {
+                        //start the dice
+                        dice.transform.position = Vector3.SmoothDamp(dice.transform.position,
+                            transform.position + Vector3.up * 2, ref useLess, 0.2f);
+                        diceScript.StartRandom();
+                    }
                 }
             }
             else
@@ -157,5 +162,9 @@ public class PlayablePlayer : Player
         transform.position = new Vector3(nextPoint.x, transform.position.y, nextPoint.z);
         interPol += (Time.deltaTime * speed) / Mathf.Abs(Vector3.Distance(moveTo, lastPos));
     }
-    
+
+    private void Finish()
+    {
+        client.SendFinished();
+    }
 }
\ No newline at end of file
diff --git a/FlufflParty/Assets/Scripts/Players/Player.cs b/FlufflParty/Assets/Scripts/Players/Player.cs
index 003e5eb..97fa69b 100644
--- a/FlufflParty/Assets/Scripts/Players/Player.cs
+++ b/FlufflParty/Assets/Scripts/Players/Player.cs
@@ -7,6 +7,11 @@ public class Player : MonoBehaviour
     public bool activated = false;
     protected bool wurfelt = false;
     
+    public GameObject camera;
+    protected Vector3 velocity = Vector3.zero;
+
+    protected Vector3 cameraOffset = new Vector3(-5.81f, 8.13f, 7.6f);
+    
     //Aktiviert den Player
     public void Activate()
     {
diff --git a/FlufflParty/Assets/Scripts/Start/StartHandler.cs b/FlufflParty/Assets/Scripts/Start/StartHandler.cs
index e36a6cd..796b22a 100644
--- a/FlufflParty/Assets/Scripts/Start/StartHandler.cs
+++ b/FlufflParty/Assets/Scripts/Start/StartHandler.cs
@@ -13,6 +13,9 @@ public class StartHandler : MonoBehaviour
     [SerializeField] private GameObject layout1;
     [SerializeField] private GameObject layout2;
     [SerializeField] private TMP_Text roomCodeEnter;
+    [SerializeField] private GameObject buttonJoin;
+
+    private string roomcode;
 
     private void Start()
     {
@@ -20,6 +23,8 @@ public class StartHandler : MonoBehaviour
         
         layout1.SetActive(true);
         layout2.SetActive(false);
+        
+        buttonJoin.SetActive(false);
     }
 
     public void ButtonNewRoom()
@@ -41,6 +46,7 @@ public class StartHandler : MonoBehaviour
         string code = Encoding.ASCII.GetString(readMessage);
         
         PlayerPrefs.SetString("roomcode", code);
+        roomcode = code;
         PlayerPrefs.Save();
         
         layout2.GetComponentInChildren<TMP_Text>().text = "Your room code is: \n" + code;
@@ -49,6 +55,7 @@ public class StartHandler : MonoBehaviour
     public void ButtonJoin()
     {
         string code = roomCodeEnter.text;
+        roomcode = code;
         PlayerPrefs.SetString("roomcode", code);
         PlayerPrefs.Save();
         
@@ -58,6 +65,9 @@ public class StartHandler : MonoBehaviour
 
     public void ButtonJoin2()
     {
+        PlayerPrefs.SetString("roomcode", roomcode);
+        PlayerPrefs.Save();
+        
         SceneManager.LoadScene(1, LoadSceneMode.Single);
         client.Close();
     }
@@ -72,4 +82,16 @@ public class StartHandler : MonoBehaviour
     {
         GUIUtility.systemCopyBuffer = PlayerPrefs.GetString("roomcode");
     }
+
+    public void OnTextHasChanged(string s)
+    {
+        if (s.Length >= 10)
+        {
+            buttonJoin.SetActive(true);
+        }
+        else
+        {
+            buttonJoin.SetActive(false);
+        }
+    }
 }
diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset
index ded68f4..f0526f1 100644
--- a/FlufflParty/ProjectSettings/ProjectSettings.asset
+++ b/FlufflParty/ProjectSettings/ProjectSettings.asset
@@ -831,7 +831,7 @@ PlayerSettings:
   allowUnsafeCode: 0
   useDeterministicCompilation: 1
   enableRoslynAnalyzers: 1
-  selectedPlatform: 2
+  selectedPlatform: 0
   additionalIl2CppArgs: 
   scriptingRuntimeVersion: 1
   gcIncremental: 1
diff --git a/FlufflParty/ProjectSettings/QualitySettings.asset b/FlufflParty/ProjectSettings/QualitySettings.asset
index df6b0be..707035d 100644
--- a/FlufflParty/ProjectSettings/QualitySettings.asset
+++ b/FlufflParty/ProjectSettings/QualitySettings.asset
@@ -4,7 +4,7 @@
 QualitySettings:
   m_ObjectHideFlags: 0
   serializedVersion: 5
-  m_CurrentQuality: 2
+  m_CurrentQuality: 3
   m_QualitySettings:
   - serializedVersion: 2
     name: Very Low
@@ -117,15 +117,15 @@ QualitySettings:
   - serializedVersion: 2
     name: High
     pixelLightCount: 2
-    shadows: 2
-    shadowResolution: 1
+    shadows: 1
+    shadowResolution: 0
     shadowProjection: 1
     shadowCascades: 2
-    shadowDistance: 40
+    shadowDistance: 30
     shadowNearPlaneOffset: 3
-    shadowCascade2Split: 0.33333334
+    shadowCascade2Split: 0.7905023
     shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
-    shadowmaskMode: 1
+    shadowmaskMode: 0
     skinWeights: 2
     textureQuality: 0
     anisotropicTextures: 1
@@ -231,7 +231,7 @@ QualitySettings:
     PSP2: 2
     Server: 0
     Stadia: 5
-    Standalone: 5
+    Standalone: 3
     WebGL: 3
     Windows Store Apps: 5
     XboxOne: 5
diff --git a/FlufflParty/UserSettings/Layouts/default-2021.dwlt b/FlufflParty/UserSettings/Layouts/default-2021.dwlt
index 84d1c0e..5cdef4a 100644
--- a/FlufflParty/UserSettings/Layouts/default-2021.dwlt
+++ b/FlufflParty/UserSettings/Layouts/default-2021.dwlt
@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 1920
     height: 1117
   m_ShowMode: 4
-  m_Title: Hierarchy
+  m_Title: Game
   m_RootView: {fileID: 6}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -48,7 +48,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 40
+  controlID: 78
 --- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -111,7 +111,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ConsoleWindow
+  m_Name: ProjectBrowser
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -120,14 +120,14 @@ MonoBehaviour:
     y: 686
     width: 1447
     height: 381
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 18}
+  m_MinSize: {x: 231, y: 271}
+  m_MaxSize: {x: 10001, y: 10021}
+  m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
   - {fileID: 18}
-  m_Selected: 1
-  m_LastSelected: 0
+  m_Selected: 0
+  m_LastSelected: 1
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -223,7 +223,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 47
+  controlID: 557
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -248,7 +248,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 48
+  controlID: 55
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -259,7 +259,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
+  m_Name: SceneView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -270,13 +270,13 @@ MonoBehaviour:
     height: 686
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 12}
+  m_ActualView: {fileID: 14}
   m_Panes:
   - {fileID: 14}
   - {fileID: 13}
   - {fileID: 12}
-  m_Selected: 2
-  m_LastSelected: 0
+  m_Selected: 0
+  m_LastSelected: 2
 --- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -305,10 +305,8 @@ MonoBehaviour:
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
     m_SaveData: []
-  m_SerializedViewNames:
-  - UnityEditor.DeviceSimulation.SimulatorWindow
-  m_SerializedViewValues:
-  - F:\Projects\Unity\flufflparty\FlufflParty\Library\PlayModeViewStates\46d6f1c4f31f58e4cacd8a58295190c9
+  m_SerializedViewNames: []
+  m_SerializedViewValues: []
   m_PlayModeViewName: GameView
   m_ShowGizmos: 0
   m_TargetDisplay: 0
@@ -317,7 +315,7 @@ MonoBehaviour:
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
-  m_EnterPlayModeBehavior: 2
+  m_EnterPlayModeBehavior: 0
   m_UseMipMap: 0
   m_VSyncEnabled: 0
   m_Gizmos: 0
@@ -340,7 +338,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 1
+    m_EnableMouseInput: 0
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -391,9 +389,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 329
+    x: 343
     y: 73
-    width: 1060
+    width: 1102
     height: 665
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -672,14 +670,14 @@ MonoBehaviour:
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
-  m_2DMode: 0
+  m_2DMode: 1
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 98.8307, y: 8.411106, z: 123.58132}
+    m_Target: {x: 977.5928, y: 457.28116, z: 33874.965}
     speed: 2
-    m_Value: {x: 98.8307, y: 8.411106, z: 123.58132}
+    m_Value: {x: 977.5928, y: 457.28116, z: 33874.965}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -726,17 +724,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.44589415, y: 0.51905, z: -0.27737507, w: -0.6744397}
+    m_Target: {x: 0, y: 0, z: 0, w: 1}
     speed: 2
-    m_Value: {x: -0.44588518, y: 0.5190396, z: -0.27736947, w: -0.67442614}
+    m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 2.1001658
+    m_Target: 709.59906
     speed: 2
-    m_Value: 2.1001658
+    m_Value: 709.59906
   m_Ortho:
-    m_Target: 0
+    m_Target: 1
     speed: 2
-    m_Value: 0
+    m_Value: 1
   m_CameraSettings:
     m_Speed: 1.005
     m_SpeedNormalized: 0.5
@@ -750,7 +748,7 @@ MonoBehaviour:
     m_FarClip: 10000
     m_DynamicClip: 1
     m_OcclusionCulling: 0
-  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
+  m_LastSceneViewRotation: {x: -0.44589415, y: 0.51905, z: -0.27737507, w: -0.6744397}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
@@ -811,9 +809,9 @@ MonoBehaviour:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 766a0000
-    m_LastClickedID: 27254
-    m_ExpandedIDs: 00000000285d00002a5d00002c5d0000
+    m_SelectedIDs: ae5d0000
+    m_LastClickedID: 23982
+    m_ExpandedIDs: 00000000285d00002a5d00002c5d00009e5d000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -971,7 +969,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 30e1ffff72e1ffff54e8ffff64e8ffff4aebffff8aebffff26f1ffff36f1ffffb2f2fffff2f2ffffd4f9ffffe4f9ffff04fbffff
+      m_ExpandedIDs: 1831ffff6831ffff4a38ffff5a38ffff843affffd23affffb441ffffc441ffff4850ffff9650ffff7857ffff8857ffffa859fffff859ffffda60ffffea60ffff4e63ffff2868ffff8268ffff4a6fffff666fffff8080ffff2c83ffff8283ffff648affff748affff928cffffe88cffffca93ffffda93ffffe095ffff3696ffff189dffff289dfffff89effff4e9fffff30a6ffff40a6ffffe4d5ffff04fbffff345c0000605c0000965c00009c5c000058a6000036bc000048bc000064bc00007ebc0000aabc0000b4bc0000c4bc0000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -987,7 +985,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 3}
+        m_ClientGUIView: {fileID: 4}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml
index c4bb450..0aa387d 100644
--- a/Server/.idea/workspace.xml
+++ b/Server/.idea/workspace.xml
@@ -33,21 +33,21 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "project.structure.last.edited": "Artifacts",
-    "project.structure.proportion": "0.0",
-    "project.structure.side.proportion": "0.2",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Artifacts&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RunManager">
     <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="Main" />
@@ -72,6 +72,7 @@
       <updated>1674839030210</updated>
       <workItem from="1674839031467" duration="221000" />
       <workItem from="1674839402490" duration="20380000" />
+      <workItem from="1674897525328" duration="2102000" />
     </task>
     <servers />
   </component>
diff --git a/Server/out/artifacts/Server_jar/Server.jar b/Server/out/artifacts/Server_jar/Server.jar
index cb3e6c818eee03efe2b913353b45cb355a6d2bab..3ed9274c7f23fcc1aa4fe243effd94e25cdc8e02 100644
GIT binary patch
delta 6270
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
CpSZ>V

delta 6117
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

diff --git a/Server/out/production/Server/Room$1.class b/Server/out/production/Server/Room$1.class
index 205f8bc9c75e5abb06f41169498e55700ca47847..1a6b7fd910a09b59f3cc7d8464a0ed9126eb5bc8 100644
GIT binary patch
delta 469
zcmbVIJxhX76n^e`@B6;Kq9BC@)gTp>T55tpEr}o`SkTAfR!d8@MMOn`1rd=%x1}fq
zi5!A(a1aWAfiyHmThP)LEqxdr``kOr^PJ~7ANSm+x{SMUq}yc$26TY#)u|q9AQNA~
zl9*$eb28PtJ}1&@)|e#WQCCLVd#v?IxAYYuO3=$WB)(~LxCp1qerZc-uC<Aj)Rf2U
zF$#I;15%BeQGfMe<Ug(ZW;9S8hJ*uc=zt~8NRWhu5XET-79}W4InFh-@&RQ8)uTC+
znim&X5U-dgfhDeABm>LTh!yf<l?EB(P~5*x32agdTXevf#SYKfrW0hSgk7pIUSp5$
zpm;m50jJ8?yi?~GhacUL)WrD75Fr<O5P(L>UpN2b@|Ht*;p12GhohY@0qk^(AWso+
p&<#T91tHA(G+LCj`a4OyU@T@LBHmChp5d$UDzuvN=a5QTT_5D*T`>Rv

delta 271
zcmXw!y-EX75QV?F*WFFlfDkp6SZItUCUGOAuu`_LGtXdUqXAI_ks!tguo<wjw%S4j
z!9uaJ6(7PXpdi>-xHurrFmss0ocXz!{wm*G1+l*+BmkG_b&ysh<IjwezJ=A2X&&@t
zQTM`a$FshK=aOm`ZTNh%r;kxvj|=75+~X)QPmLmpjO5+WGiT#2S<w5!Zs$NAIFwh8
z<jruz(0WefgMo9Lx{BcpXRgK2rocYqIw;n+o>(?-GDcVKXwk;Y=Rarab?P*1lf6LI
nwnOY{te8S5xhe@AyKL3?9#a~|YZH_5O(Tuy{@^X^PQ3IBb5%5g

diff --git a/Server/out/production/Server/Room.class b/Server/out/production/Server/Room.class
index 5cd6c7712b76e1dbff99043b051788909ea1d00f..2b81b7eb0c0c789d1d21d18ea76a4daca990570a 100644
GIT binary patch
delta 114
zcmWN_F$#iU0EXfBbCgct4ZM>S4F-Zs{{h<Fg=!ITb4Y#>3|k^XBn!Gs5G|q81CRBr
zXBTd`XUTzxBQZXPj2$@%1u5mcCqC4CsrX^}Q%kf8xM;;$YdUQx6qCzvS3<Ab?7*mz
OK~Elf^J=#4)tLa(OeDtu

delta 114
zcmWN?F$#iU0EXfBYZOo54Z4#Q4h4aW9-ys45OD}3id+;M|By&r#3`_$%LLI9`7Dod
zjALwTv0=uR6+3*Ugv6{#h)CI!ap1_CoDV0yocWPU6mq#}PAQK{OH%nH3b`txRzLor
P(ZEel?t0PIfz?g^bBH4a

diff --git a/Server/out/production/Server/Server$1.class b/Server/out/production/Server/Server$1.class
index ec0101f3669996a3af6a757c72d9b86b435914a0..fb1497e5b20f02012b97490ecc8e1b7467f638e4 100644
GIT binary patch
delta 951
zcmYk5X;TzQ5Qd+c9;Rm6LfSw<G*H|@MFdd+MexFFJ@5d>V_01s5fQ{0mGM5tYcG%W
zXwO~U^$PvqCyxL_4P!U-%WlN}1Ac)2U_WSxS!jfIM0Vy|nQ!)+Rn>2Ddk1I!{qX!1
zP{q9nQI^}+3YTIUHBBxniMa$>rCDvk8W+u4yApR<O0$LEY1V1hNBEu%E(6(UGYOY$
zHrc4fWizc2w$P^8>XJuen0D(s!fbQPB<OV6PSVz;G&@{Iu+xHFwnvvHt=X;FquG1m
zey@K=4e^hwBELr^b7gs-$P{s!YSAFIes!Q?=zhZiDh(x!GmK%Zp_EERzW=w%&lZm1
zAcySYVgFX3aQzW7792Gk<GA4jCk;RFqaxUpN^Mto9f>`Oiq1r`tzu<*S9?+h`N{Az
zzgX5O!)eag=&a#a&S}mYE^txf8!mC#ALbN0SGeleJHtz^ab5G9;dgErZt{mBG`F+8
zHJP^jKMl9IZMehTCmCmgQ#_z0l}snvlU++%_bY~!G<?yqd{akjOS*1cv;Q!3Wpq@|
zOEH>&=h<;Vyv#1g8W1aGykyJ#ExKq%x!{l>q<Vt9^ZF}ts9=&H$m!=PshCWqWl4+0
z!ia#H=D*gH11jYIuTNw$Wd*@*+%+#47%vDuCZ`9lR+m0SJtMb3cT;$sF)tVqFE1P4
z!^qn3SE-`E$Sw$XGwJ~~<(~U89Cy4-EFN@X@hq{Bm=+6*c@}sUdHpcr#JVvL$PX@k
zB=WLUm72;oIM~6O$@BjS*Jb9>%L3lAkoPR2j|NpmOzN6c4XgUcUMB-J(k8dQnk>4Q
z&lIN0m~R<O4buqopJZ#PllwhLMVZbF*{DL5&rD{?*P?0=vxOV9+wytyL<{w@`Dz1m
zL`*fIK2eaRnX8$nnXg%(`4--h`XKV8^TIw65cpI8bF_$+-iw7CU<nQ4gYp9{W1>W^
JOdAz1&qqsXqmTdq

delta 786
zcmXYvTTo3=7{`D6Tw3RByE>Fiqc~0_-Ib6MazyDSw?wW<A|;hON$zsV&LzSlGoD<g
z&<q|tHDktWGv~pJM>BXZX3XGQv1j)BzW@6E|8M=*B^3QWs%!N3>o-6y54{Aa&_kt3
z0#%AtCe^Gqaj{0RR)cjWiuHP?#-xl58rCW{DmHnkW3x#FTXbcsNjTedw%ue0^<H+;
zpx9*+LzRa{9d~<ZGLt3QW3rcK#XggGS~R~^%l9kV6bBUTijKY~A$!p9Pg3>GO${v_
z*#@5S;CO1kGTMB?>J-CbQ;{n=yU>v}`Jlxiax9XWWs$^8ixhI~Zb#gNPK(1F(fFwS
z*bzVF7{@g@VR4c!i&J!4oTkSPIpR{!Se)gYE}yr!z(t*1vbapI;)=ypt|_it^l`%u
zI1`;V{dTEyYQjx!DQ;WbVZb2lpH(frYjKZ3i~Bry-s{YC+MmMulLB(!28lR)K5Y~v
zifg$Shx{p|N;S<MQ2xSn!C`_BUWSY@<BUi$nJow+$90A<vdPgZFg}aIE4A<T50&HK
zt)1%Wsme=_bq!(Gj1W;9>v~4yFur^>LVRsTdfG74@;#|9FkTWBtA?2Vj__E|5dKHF
zDxOMPH(&V544h~~l|<P=Z$Vd(F^Z*9F13|>qhj1*oh)8WBXi`DxoH>1T;_?T5BQl+
zo;;y3qFF#b9wri^fQ7QDcs^3dB3U7UQ5K8VrMK{Zqk8=%a!>|EGMj+=4<!`26-yOC
n#WF>)VmbVx^(VP9xdQ1_B3uWh;tlCmCO)$yGo?#FqI`b=OWTCh

diff --git a/Server/out/production/Server/Server.class b/Server/out/production/Server/Server.class
index 344c88b31cf4b67ad51792704c9ee1ecf36ba4a5..6e6b425a4d46f471cfb5b47bf3bad918aba50824 100644
GIT binary patch
delta 56
zcmbOxJWY7RX?ET)hERrZh6sj8hFFHE$v4<%Nyag-G9)nYG9)pGGNdqQFk~=T0Qq(d
KIh(sVxETS4Yz#mE

delta 56
zcmbOxJWY7RX?9*ehEN87h6sj0hFFH6$v4<%Nro}70{OfQQ4FFCF$@|E2@DoMz8yo#
J=57vdMgV<03+Mm<

diff --git a/Server/src/Room.java b/Server/src/Room.java
index 8ee5519..609fbff 100644
--- a/Server/src/Room.java
+++ b/Server/src/Room.java
@@ -111,6 +111,15 @@ public class Room
                                         }
                                         break;
                                     case 0:
+                                        try
+                                        {
+                                            for (int i = 0; i < players.length; i++)
+                                            {
+                                                players[player].output.write(new byte[]{127, 0, 0, 0, 0, 0, 0, 0, 0, 0});
+                                            }
+                                        } catch (IOException ex)
+                                        {
+                                        }
                                         server.deleteRoom(roomCode);
                                         for(int i = 0; i < threads.size(); i++)
                                         {
@@ -121,6 +130,15 @@ public class Room
 
                             } catch (IOException e)
                             {
+                                try
+                                {
+                                    for (int i = 0; i < players.length; i++)
+                                    {
+                                        players[player].output.write(new byte[]{127, 0, 0, 0, 0, 0, 0, 0, 0, 0});
+                                    }
+                                } catch (IOException ex)
+                                {
+                                }
                                 for(int i = 0; i < threads.size(); i++)
                                 {
                                     threads.get(i).stop();
diff --git a/Server/src/Server.java b/Server/src/Server.java
index 389fc6f..75ac91b 100644
--- a/Server/src/Server.java
+++ b/Server/src/Server.java
@@ -64,9 +64,17 @@ public class Server
                                     input.read(readData);
 
                                     String roomCode = new String(readData, StandardCharsets.US_ASCII);
-                                    Client client1 = new Client(output, input, client);
 
-                                    rooms.get(roomCode).addClient(client1);
+                                    if(rooms.containsKey(roomCode))
+                                    {
+                                        Client client1 = new Client(output, input, client);
+
+                                        rooms.get(roomCode).addClient(client1);
+                                    }
+                                    else
+                                    {
+                                        output.write(new byte[]{127, 0, 0, 0, 0, 0, 0, 0, 0, 0});
+                                    }
 
                                     break;
                             }