diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset index df99f39..e767941 100644 --- a/FlufflParty/ProjectSettings/ProjectSettings.asset +++ b/FlufflParty/ProjectSettings/ProjectSettings.asset @@ -137,7 +137,9 @@ PlayerSettings: 16:9: 1 Others: 1 bundleVersion: 0.14 - preloadedAssets: [] + preloadedAssets: + - {fileID: -6230802382160794249, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2} + - {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml index ca4da1d..73a85d9 100644 --- a/Server/.idea/workspace.xml +++ b/Server/.idea/workspace.xml @@ -98,7 +98,7 @@ - + diff --git a/Server/out/artifacts/Server_jar/Server.jar b/Server/out/artifacts/Server_jar/Server.jar index 687d673..f17ef39 100644 Binary files a/Server/out/artifacts/Server_jar/Server.jar and b/Server/out/artifacts/Server_jar/Server.jar differ diff --git a/Server/out/production/Server/Server$1.class b/Server/out/production/Server/Server$1.class index f0e2458..0a290f4 100644 Binary files a/Server/out/production/Server/Server$1.class and b/Server/out/production/Server/Server$1.class differ diff --git a/Server/out/production/Server/Server.class b/Server/out/production/Server/Server.class index 1a48e3b..faf7f69 100644 Binary files a/Server/out/production/Server/Server.class and b/Server/out/production/Server/Server.class differ diff --git a/Server/src/Server.java b/Server/src/Server.java index 34e02c0..5358bf0 100644 --- a/Server/src/Server.java +++ b/Server/src/Server.java @@ -24,8 +24,10 @@ public class Server //A Formatter for date and time log outputs public void deleteRoom(String code) { - rooms.get(code).closeRoom(); + Room r = rooms.get(code); + r.closeRoom(); rooms.remove(code); + publicRooms.remove(r); //LOG System.out.println("Room " + code + " successfully deleted");