From 42c6d0ac6a36b808716037e4c0901d92254d87cd Mon Sep 17 00:00:00 2001 From: brausjonas Date: Sat, 1 Apr 2023 15:02:44 +0200 Subject: [PATCH] Not Closing Rooms Fix --- .../.idea.FlufflParty/.idea/workspace.xml | 3 +- FlufflParty/Assets/Scenes/Start.unity | 142 +++++++++++++++++- .../Assets/Scripts/Start/StartHandler.cs | 7 + .../ProjectSettings/ProjectSettings.asset | 2 +- .../UserSettings/EditorUserSettings.asset | 4 +- .../UserSettings/Layouts/default-2021.dwlt | 103 ++++++------- Server/.idea/workspace.xml | 2 + Server/out/artifacts/Server_jar/Server.jar | Bin 9247 -> 9364 bytes Server/out/production/Server/Server$1.class | Bin 3154 -> 3309 bytes Server/out/production/Server/Server.class | Bin 2588 -> 2632 bytes Server/src/Server.java | 12 +- 11 files changed, 213 insertions(+), 62 deletions(-) diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml index c2aeefa..6a8ef07 100644 --- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml +++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml @@ -52,7 +52,7 @@ } - diff --git a/FlufflParty/Assets/Scenes/Start.unity b/FlufflParty/Assets/Scenes/Start.unity index 5fac47e..61c1939 100644 --- a/FlufflParty/Assets/Scenes/Start.unity +++ b/FlufflParty/Assets/Scenes/Start.unity @@ -2930,7 +2930,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -0.000030517578, y: -0.37069702} + m_AnchoredPosition: {x: 0, y: -0.37069702} m_SizeDelta: {x: 0, y: 460.7464} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1440669665 @@ -3136,12 +3136,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2072539373} + - {fileID: 1797005344} m_Father: {fileID: 1780335805} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -74.20001, y: 57.312} + m_AnchoredPosition: {x: -37.7, y: 57.312} m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1574528323 @@ -3709,7 +3710,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1780335805 RectTransform: m_ObjectHideFlags: 0 @@ -4055,6 +4056,141 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1795888347} m_CullTransparentMesh: 1 +--- !u!1 &1797005343 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1797005344} + - component: {fileID: 1797005346} + - component: {fileID: 1797005345} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1797005344 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1797005343} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1574528322} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -200.00002, y: 0} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1797005345 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1797005343} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Share first then:' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3f776446f6429de4b92b7db92e77952e, type: 2} + m_sharedMaterial: {fileID: -996942129922571021, guid: 3f776446f6429de4b92b7db92e77952e, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 23.1 + m_fontSizeBase: 23.1 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1797005346 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1797005343} + m_CullTransparentMesh: 1 --- !u!1 &1805136054 GameObject: m_ObjectHideFlags: 0 diff --git a/FlufflParty/Assets/Scripts/Start/StartHandler.cs b/FlufflParty/Assets/Scripts/Start/StartHandler.cs index 93b875b..20a8ad6 100644 --- a/FlufflParty/Assets/Scripts/Start/StartHandler.cs +++ b/FlufflParty/Assets/Scripts/Start/StartHandler.cs @@ -111,6 +111,13 @@ public class StartHandler : MonoBehaviour public void ButtonBack() { + client.Close(); + client = new TcpClient("185.245.96.48", 8051); + Stream stream = client.GetStream(); + stream.Write(new byte[]{3, 0, 0, 0, 0, 0, 0, 0, 0, 0}); + byte[] roomCode = Encoding.ASCII.GetBytes(PlayerPrefs.GetString("roomcode")); + stream.Write(roomCode); + SceneManager.LoadScene(0, LoadSceneMode.Single); } diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset index e708524..df99f39 100644 --- a/FlufflParty/ProjectSettings/ProjectSettings.asset +++ b/FlufflParty/ProjectSettings/ProjectSettings.asset @@ -840,7 +840,7 @@ PlayerSettings: allowUnsafeCode: 0 useDeterministicCompilation: 1 enableRoslynAnalyzers: 1 - selectedPlatform: 1 + selectedPlatform: 2 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 diff --git a/FlufflParty/UserSettings/EditorUserSettings.asset b/FlufflParty/UserSettings/EditorUserSettings.asset index bac6747..299540d 100644 --- a/FlufflParty/UserSettings/EditorUserSettings.asset +++ b/FlufflParty/UserSettings/EditorUserSettings.asset @@ -12,10 +12,10 @@ EditorUserSettings: value: 55010d0300055a5a595a592641730d44104e4c287b2e71662c7b186bb3b86069 flags: 0 RecentlyUsedSceneGuid-2: - value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 RecentlyUsedSceneGuid-3: - value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a + value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b flags: 0 UnityRemoteDevice: value: 225f4d46245b0d4902070862342649191512 diff --git a/FlufflParty/UserSettings/Layouts/default-2021.dwlt b/FlufflParty/UserSettings/Layouts/default-2021.dwlt index 3f8e959..9341136 100644 --- a/FlufflParty/UserSettings/Layouts/default-2021.dwlt +++ b/FlufflParty/UserSettings/Layouts/default-2021.dwlt @@ -14,14 +14,14 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 2127 - y: 126 - width: 1436 - height: 674 + x: 613 + y: 243 + width: 641 + height: 662 m_ShowMode: 0 - m_Title: Project Settings + m_Title: Build Settings m_RootView: {fileID: 4} - m_MinSize: {x: 310, y: 221} + m_MinSize: {x: 640, y: 601} m_MaxSize: {x: 4000, y: 4021} m_Maximized: 0 --- !u!114 &2 @@ -58,16 +58,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectSettingsWindow + m_Name: BuildPlayerWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1436 - height: 674 - m_MinSize: {x: 310, y: 221} + width: 641 + height: 662 + m_MinSize: {x: 640, y: 601} m_MaxSize: {x: 4000, y: 4021} m_ActualView: {fileID: 16} m_Panes: @@ -92,12 +92,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1436 - height: 674 - m_MinSize: {x: 310, y: 221} + width: 641 + height: 662 + m_MinSize: {x: 640, y: 601} m_MaxSize: {x: 4000, y: 4021} vertical: 0 - controlID: 475 + controlID: 1715 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -192,7 +192,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 54 + controlID: 178 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -217,7 +217,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 55 + controlID: 179 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -242,7 +242,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 56 + controlID: 122 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -267,7 +267,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 57 + controlID: 123 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -385,35 +385,30 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 13854, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12043, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 310, y: 200} + m_MinSize: {x: 640, y: 580} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Project Settings - m_Image: {fileID: -5712115415447495865, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Build Settings + m_Image: {fileID: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2127 - y: 126 - width: 1436 - height: 653 + x: 613 + y: 243 + width: 641 + height: 641 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] - m_PosLeft: {x: 0, y: 0} - m_PosRight: {x: 0, y: 0} - m_Scope: 1 - m_SplitterFlex: 0.2 - m_SearchText: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 4dcf9b58 - m_LastClickedID: 1486606157 - m_ExpandedIDs: 0478ab97a01a5fa600000000c53aba5a + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -472,22 +467,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Materials + - Assets m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Materials + - Assets m_LastFoldersGridSize: -1 m_LastProjectPath: D:\Unity\flufflparty\FlufflParty m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 277} - m_SelectedIDs: 1a6a0000 - m_LastClickedID: 27162 - m_ExpandedIDs: 0000000096690000986900009a6900009c6900009e69000000ca9a3b + scrollPos: {x: 0, y: 79} + m_SelectedIDs: 9c690000 + m_LastClickedID: 27036 + m_ExpandedIDs: 000000009c6900009e690000a0690000a2690000a469000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -515,7 +510,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000096690000986900009a6900009c6900009e690000 + m_ExpandedIDs: 000000009c6900009e690000a0690000a2690000a4690000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -542,7 +537,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000906400007e6d0000485d00002c610000fa0b020046650000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -604,7 +599,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: cc91ffff2092ffff1a96ffff4896ffff469cffff9a9cffff66a0ffff94a0ffff06fbffff + m_ExpandedIDs: e0d3ffff32d4ffff58d8ffff88d8ffff8edbffffdedbffff04e0ffff34e0fffface9ffff06fbffffee6d00003c6e0000686e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -620,7 +615,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 13} + m_ClientGUIView: {fileID: 12} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -1013,14 +1008,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: 88.2527, y: 15.438611, z: 131.604} + m_Target: {x: 884.68835, y: 244.03244, z: 2.0766582} speed: 2 - m_Value: {x: 88.2527, y: 15.438611, z: 131.604} + m_Value: {x: 884.68835, y: 244.03244, z: 2.0766582} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1067,17 +1062,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.03943621, y: -0.9346003, z: 0.3361925, w: -0.10956729} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: -0.039434966, y: -0.9345708, z: 0.33618188, w: -0.10956383} + m_Value: {x: -0, y: -0, z: 0, w: -0.99999994} m_Size: - m_Target: 1.1898067 + m_Target: 335.76297 speed: 2 - m_Value: 1.1898067 + m_Value: 335.76297 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 @@ -1091,7 +1086,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.03943621, y: -0.9346003, z: 0.3361925, w: -0.10956729} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml index 1c270b5..34b4792 100644 --- a/Server/.idea/workspace.xml +++ b/Server/.idea/workspace.xml @@ -95,6 +95,8 @@ + + diff --git a/Server/out/artifacts/Server_jar/Server.jar b/Server/out/artifacts/Server_jar/Server.jar index f60d8462e3ed58969fe6b8958a6306d8f0202def..196cdb9939f02bd7b67f5a1f79f1731363deedb8 100644 GIT binary patch delta 3437 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 delta 3319 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�pmudXd{z{Z+ADKE!aA+f@`J!$voo7!}Xk;miHdED2+h2l^#pcX;wj9KQP2){& z%^bOH@LXtSe{z(tIfRfYb9^6_Y?c|6cKb?uRL1gKNrqv^^jHGwW95o{g>o&AC_v0| zN;mj+4Dm$`@!`!9#JYl;Wh>Zxf1JyN+*#hKwnQj83*7QK4* z3TXA*5k7TBv25hiG}5e^O=oz8-;WiJcnwe>q1}O;hJ6 znqePe3lF@s3QazVR=O?P=_Ox*03ULC3hQn*Avm#!&}|6u_-zDkxTcTOxti2~YE+^YHFP2M5hZ(u*y*|zunW6=r}HihV0-)) zghU?Ve@_VKQRP$8@tde#f=rQCMONogL%f>e}W8>9(f23}>dG^z16M5vgf8vnnj1jH`Vd)}%H#SpIV-$S{zNSii zL)zaGnkz2eDA{d73kEPqzG76fz1ZjGFyQB~-)&5wk#7G3B%pVwpT?hl8k4oskKt6s zuI9wuE9j;(s9!;2qWOEY)FV1uk4Mytm&UK6&S$j|YcpqE2nbj2{l0|QMB*m4EFwO_ zf7?L0B`zaOO|M8LuDf$nOzb=QZEy{%aFc-EBDi-bt!vcWyBNmLIEr6z62H2M#i>Ce zB|eNpZaR~GIzb$#mZT_$VQS(C6(iuLSdZX85JemoqBVaZ_%}9)I8qzND4z85O}cF) z4;1^@t3ljb8Y zAYgodR`|hMERqEP02~Sc01N;C0000000000000298k037I01i?ZX_TE_aOiP002$_ BKm`B* diff --git a/Server/out/production/Server/Server$1.class b/Server/out/production/Server/Server$1.class index aeaa3fab3eb04e8f1aa0add0aafc13c1eedcb846..de9d95b7c055d52ee8d1ea4920ef4565452b78a2 100644 GIT binary patch delta 1465 zcmZXU`&U#|6vsbjhT+_~90dmyE`~uq@-aq9zQ$KbFH6(ZLNZa35wwv(1XEMT(ljYk zx>{)_Sr%naK`$nzRzKCMU;5D>`VU(D0j(A7Gq_wXoi+QMz4zIV@7ecz@1G@qdzs(< zyL=URm|vpAS!0)am#M7PtaEALC6^r5YZ|SQbkS_Eo+fKHJ8X2>#LJpgl+Cob3@7cf znpV4PvC(ast=4FFDWbz_+gx5@dz2mQ)GU3~rIfV}yX?N(VUOK2E_->+;dO_7w&s4D z@`mPs%Xki2<4s%ckVB{DEr+)?hc)kLj&%KceNlc}I=#6j-I!dNu1Tf0CKaL83l$^p zaIa`@+t|{ih%MgKu&tpo)zH#ZIpmw8$XPG>zOSbFH&j=l6hA8SkSS>9%Vnjhzb8~# z(q(v;xrT?BW~k&rLltus#r_zlxIl6YKF6%{xT3@_2$hU8yvO_2^MT<6Ck-Fkgvk1~ zhONz-Q-+T??avOE&8p%P!>61ze8%U79=;Gz%jIH*FF9u`d}a8WZ#3T;zTxQ5Bx$mFw z4&@(NiK?eWBb|)z_)Z)cClNMDYNjf&zPWkX_~=TndR)38NI# z{okGPc{9Y$6$@rFQ`S-0h<0(%(Yn%ZjuZG>Y6_(T9w%)QITvc*$%eW zUm~_svq)H^T4ayNv?&33YH`e5VpwgDnqS~vaT1ZZ7YT4{2N+)GMS98ary!9#`2xzz z4H(g*imiT$SVB+rbU@(%MRnO=Ex{Ry9y%Y{&!~hmq!-^hmt)TfD5>qm8=$nVpV6^< z0?KX=5HmJLmVkQ$%7-xaa3=2M+`^S}6Ib+3XSGG^dTy*Dc3;5QgnJW!7Y!J9f{6o+ zubUd5;<^1yNaWpic>i^Zyu5&ke#)IWxlrK6CQ0`m%o3{$it_U^@QCVF7nv+$w2$f} z6Z}71FSCwX8d=2#>PYbdXZMyyoKgX&)m1*uWVy1RVbZjM zdCV6EbP6XH@Q84uTRu0{;?vUhX%Kpdlw^e&tB$Z(s^myhhb25?8KtgenVAvFsmm-CYAcq>TpDo(<;oGwvzq0a6`GZr z=V17Rf9V($BIez7gaCYA{xB#n#NDZb0xUF?g$%9M5m2k7SBSb&89DN$T`gmuEt)GZ I;^hruniWCHcd3!RMTQ)t(x7M zwgByP*d)_wBwaR1ylALyn;v=t^wF=`V-sRit;I`*7_fNR?0aoqVV}i*i>N_3U`!5b z4%y@|XqdwW?p2E+&9KF5nj@N{nvs*=U9-J)o%Ib0&-M-OkE$poSkW5kkA&MI9ZliN z-tLx;rV>|s+!V1mCizKLno@~Zklc%&aO&$0$0>2Ri@P1}Bujv)!$V%UD^& zdk*jOfieEj;UgwAA3J=)r<(H)7r5wNh|8(`j7y5N%$~lwx`v*f#=f?;fy}z@hDdKi zeU`)LT-HoFOfjucWim4zz98l>!>qzz-qzC4(Q90M>2QTPhp+g0D%(4t+_1mEJ?HD3 zs`YoOwA9?2i?n*{)HiyCT9q%2peV$Xlw`^QvP*5GUpz94SR>N4ZbBflbe-^i;ov^* zku_~WBa!vOn~}I+CqYt7iLrvX1hKF|jk>LYHPOwYBvehPWqH%6S(X(03PZjaiE|{?%#mCZ@=X$)A!Sj#bcWPo|011sqd4S`v8-y6 z^f^K`(HU+D-Wp^1jT*uRGh~TzTZ|Qp&L?=cAmoirs1(a3pP_<>e_VmCk2 z#;^498+-VZef-4%r8%gA99CHjt1w4ZIU{N#$JJg=sX@lY<7qX_8FhlQ3-{bbyx_NU zKc)B>i}C~yP=;TOm+~MF5fJDjY@i%1;JrL7ltr@Y<`Fi^`UZHG>AzyYG{{qjG{=fhL diff --git a/Server/out/production/Server/Server.class b/Server/out/production/Server/Server.class index d0a0db2670f195b76a856bf5b1792f8f30af2f3b..6da51d608ab4bdea7dd038c0bcd7883668361d74 100644 GIT binary patch delta 572 zcmZ9J%WD&16vcmECdoG$rWiD7F-FWnYA|A;mbRd=>O#au3ym9>A(_TDX%Z)o8Xt|d z^{uUOeCtB0P{BnhB~Xe~aaAlr{|p!Y1)|o8%Wm%F9?m)Ua_$@7nos-ocV!jm=5<4h zoia3ZhE+1HenDe|QAt)~2RRQ17*ol&hJs2_a#3Px1So0jq}(bMNmXNlu=# zI?s6CqQ201$*ZNJ^P|!>M~rtI<2}duV1?EG4&la)Vn;mg)jp|lB^HdV&M|0BsDZA7 zk>E0WeC*Bo=uFKt&P9TUyoI;4Z^h>~e@r{X{N|#ypzf=8+0TI`JJcp^EaPXzPWdx^ ze6d%5C1K;|S;JtRBHyX7!C_mmA19I_PBVa`brDDCvAYYCe&PsQv7Ixvhl7(g?#KNH WDLE@b+XBCE{brYB&}+p#8~*?|GKd`j delta 493 zcmZ9I&r4KM9K}EPy&3PD%atTwMq(uq7LK5cK?R$v79naa`auvv3}xf!bEYQ8rmVEI z-=$5r-0FGwr zWz(&D$MTtMdPgA>92v}OE^*mRxb?9sT$NnYTsI5uI&s5%a1-uLX3bBxy=qR=!7bAk zSsO2DZes*B{|8F$Xzp?^wBFY|;Ni<+b=+R zCL7|FG6{>(piEu7;SKA38b^FK9G)%hTcq}%w9!gUp)})&#Xn!oH*ZtWjIv2j?J&=% z<^`*GWtVzOr@gmQp_h;BXNiM+qRTp)i6CvoUixst4s4;_a+Cvf(~q#9mF%*G9d=sX QC;AI1*)1AZm~8C(Un2)^AOHXW diff --git a/Server/src/Server.java b/Server/src/Server.java index db2e3da..ca1bf42 100644 --- a/Server/src/Server.java +++ b/Server/src/Server.java @@ -25,7 +25,7 @@ public class Server rooms.remove(code); //LOG - System.out.println("Room" + code + " successfully deleted"); + System.out.println("Room " + code + " successfully deleted"); } /** @@ -88,6 +88,12 @@ public class Server client = null; Integer.parseInt("crash"); break; + case 3: + byte[] roomCodeToClose = new byte[10]; + input.read(roomCodeToClose); + String roomCodeToCloseString = new String(roomCodeToClose, StandardCharsets.US_ASCII); + deleteRoom(roomCodeToCloseString); + break; //this case generates a new room and sends the room code to the requester (not for join) case 2: @@ -183,6 +189,10 @@ public class Server else { code[i] = (byte) (Math.random() * 25 + 97); + while(code[i] == 111) + { + code[i] = (byte) (Math.random() * 25 + 97); + } } }