From 76b160e611b6384bb35fc0282e3183ecbe4c3f24 Mon Sep 17 00:00:00 2001 From: brausjonas Date: Mon, 10 Apr 2023 15:47:19 +0200 Subject: [PATCH] Puuuuuush --- .../ProjectSettings/ProjectSettings.asset | 4 +++- Server/.idea/workspace.xml | 2 +- Server/out/artifacts/Server_jar/Server.jar | Bin 9927 -> 9970 bytes Server/out/production/Server/Server$1.class | Bin 4142 -> 4142 bytes Server/out/production/Server/Server.class | Bin 2866 -> 2940 bytes Server/src/Server.java | 4 +++- 6 files changed, 7 insertions(+), 3 deletions(-) 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 687d673b5343cf028efce7d2a343d343423540c2..f17ef3932ccd67cb2fa48972d6d76aada84ce488 100644 GIT binary patch delta 4013 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 delta 3956 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 OlguU{2A?DV0000Fo1%{Z diff --git a/Server/out/production/Server/Server$1.class b/Server/out/production/Server/Server$1.class index f0e2458b90bd1adc42d8284685c7db8b77f0c78c..0a290f42d5ec1e1679bed7a9653704f5e5b27758 100644 GIT binary patch delta 275 zcmWN{%`3wJ9LMqZ=erzCS<{kQYEp^|f59AFJRPJs$U`1hl1MhoK`S|sB@bDlNi56qwK__0isi&7l`e|W+X@;3)ggHhD zGe(qgR+wOoNp_jyh!Drjkp5pe=J{ZOZ^Eh~A`eUQ5|xjb{H&^(b+xgnAaQlEr9QSb z$euzZ6p3-54GtA2sTWRE;!I^y`Xa3#GWzAhTx89|rPYwLTJl!MmHA0o1CBLuW33dd shoTK}Ym403GWT}MgPrqe8J;Z5t2vadK*@@{*)#971E2VClGQu<0}*IMga7~l delta 275 zcmWN{O)CQc9LMqR@4p;OS<{kQYEp^|FF@oX50{m481j^oJd|z8Va-8mT59rC%Zg>j zY|+^AP#zlMEx36BUV#Ij^QYh|_%3&y>MZU#s~yoEs_4Z{AB_yqjGs1!m?gkGBP=pX zh%r_eC&C2lOtQ@sNv28tuT$p8v%m*Se6y??f^rd(o3K1Yx&cpkkKz$b8u!Z&aIA|)pKDDn-nOAjN*CIKwbMyTW1%Xjv`{Q=sUlEo+)JC%&_HU_vbaSM z6gQ;aqJp5f#^uFUOvKJOJ|ho4>Nw6QFETzk<2d6uXgy!rVHibnC+B?Ud}sOp&v&N% z=l!YEe}C~M(8kC4T*ZJEQ7r~75nC);8B)Y7^0eM+;bll0!-}{?0o$~(y?_KG`8>?1 zB5C1c$jg}4<6d@Xz0+bByA_XERPd;-|CpD@#aO}l38*JL?aE`i~8(!j&fm>(VOweKTGKUn7){~0EHm~ribJo?+^cqJD z%IlNk{r%Boa&SBz-(5ctjYr3#12#u_U2)9jI9*PQyUN?n8#c>nbJn{~*&V z+j&d(ecR?%It)s;_U-5k#rw8z33cu2kB*GR65AE;*u2Yo&QI=g-}^RcKF}#2+I+;M zljqr7T$IZiAB)99;aGCaDO3wT9rUD)bu5;Fw#qBIF?DM>nVK{P*XGVE#Fj~1u&<{? z&qMCK;*)uZT1f~KTO z`U=3x4Ao(6*NAO&&#)*mLv17w%#y0hQm+{;PS1W9o|2LX@znyvmBSjq63d+k>E5- zv$S;U7ZP5fBX|Q@+~MFS(s+*4GMOZNkB1*91kxTmS$7 delta 1368 zcma))TX0il5XXP#Bgfd8kqGu;LMmMjo|@@|YG`#XgJ2c_MdW zNo0RH2YAxL;VF&vwBn%Rnd!5GhTCH%jeYL>W}82$*zcY*3$<%lYYUmnZLZ)-n;W^w zW<49+4}C4sXE|ixPmYf6vU!dTHqUcNaoFYsUUX-DmpD0IG6=^q6McQ@OlHT#@bKPP ze|k7Qp6<7Cd0Fv_%@HB_I#tYnotNvo$O5v_l^uCdd9~FM+Ovc+Z^YFj(^AIUEXtJf$blE5IAYLxj@|(E|hUC zm-YBDHIDq5njHqKz5jNxh4P>FIzpPbyamN4#6@m&kEj*d4)KMg4pfQ^$zm2!FH5*e zJhntZj7~4pU=y2lp73F}xYb6m?;GQ+PW?zA-fjn{BY@|uLewOl8)mJ;TAZtzHSmPm9- zJ%t$=RCLROoS+068{Pi$#o3E$xOis`i~A1ewocLNL_bAbmx^ndb~({i)uYFW{MA1- zcm9BBOwCOfaZ=6eouA{ zKM0%i^vFYsA4&5QyZM<3e(~7FWlf4CH*<@}X-|n$fH7H2Qi!DGc6ww*CYooMvfogO ztwyY>{#OFCG$?MZ4ssjYBv_wNLbDegkS4Q!-Q)a8lzHAt4|e_l1Kh3;P_k3p@we<# w`2Jt=o!s>g$)-+T_TSKVbC1q;6BUv64oUgfHigE$9+~@CA=;9xM$z*90Rao!jsO4v 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");