diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml index cfa4389..79856f3 100644 --- a/Server/.idea/workspace.xml +++ b/Server/.idea/workspace.xml @@ -72,7 +72,7 @@ 1674839030210 - + diff --git a/Server/out/artifacts/Server_jar/Server.jar b/Server/out/artifacts/Server_jar/Server.jar index 3ed9274..0e8e6dc 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/Room$1.class b/Server/out/production/Server/Room$1.class index 1a6b7fd..766e3e8 100644 Binary files a/Server/out/production/Server/Room$1.class and b/Server/out/production/Server/Room$1.class differ diff --git a/Server/out/production/Server/Room.class b/Server/out/production/Server/Room.class index 2b81b7e..d81a707 100644 Binary files a/Server/out/production/Server/Room.class and b/Server/out/production/Server/Room.class differ diff --git a/Server/out/production/Server/Server$1.class b/Server/out/production/Server/Server$1.class index fb1497e..a8b1a60 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 6e6b425..92fef50 100644 Binary files a/Server/out/production/Server/Server.class and b/Server/out/production/Server/Server.class differ diff --git a/Server/src/Room.java b/Server/src/Room.java index 5852469..68f38ae 100644 --- a/Server/src/Room.java +++ b/Server/src/Room.java @@ -106,15 +106,6 @@ 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++) { @@ -125,15 +116,7 @@ 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(); @@ -197,4 +180,43 @@ public class Room } } } + + public void closeRoom() + { + try + { + + players[0].output.write(new byte[]{127, 0, 0, 0, 0, 0, 0, 0, 0, 0}); + + } catch (IOException ex) + { + } + + try + { + + players[1].output.write(new byte[]{127, 0, 0, 0, 0, 0, 0, 0, 0, 0}); + + } catch (IOException ex) + { + } + + try + { + + players[2].output.write(new byte[]{127, 0, 0, 0, 0, 0, 0, 0, 0, 0}); + + } catch (IOException ex) + { + } + + try + { + + players[3].output.write(new byte[]{127, 0, 0, 0, 0, 0, 0, 0, 0, 0}); + + } catch (IOException ex) + { + } + } } diff --git a/Server/src/Server.java b/Server/src/Server.java index 75ac91b..750c01d 100644 --- a/Server/src/Server.java +++ b/Server/src/Server.java @@ -15,6 +15,7 @@ public class Server public void deleteRoom(String code) { + rooms.get(code).closeRoom(); rooms.remove(code); System.out.println("Room " + code + " successfully deleted"); }