From e4aa7f112a8b2e13b98c950b9d413218203a14cc Mon Sep 17 00:00:00 2001 From: brausjonas Date: Sat, 28 Jan 2023 11:54:18 +0100 Subject: [PATCH] Kick All Players on Player leave --- Server/.idea/workspace.xml | 2 +- Server/out/artifacts/Server_jar/Server.jar | Bin 7945 -> 8032 bytes Server/out/production/Server/Room$1.class | Bin 2702 -> 2420 bytes Server/out/production/Server/Room.class | Bin 3376 -> 3815 bytes Server/out/production/Server/Server$1.class | Bin 2652 -> 2652 bytes Server/out/production/Server/Server.class | Bin 2454 -> 2520 bytes Server/src/Room.java | 58 ++++++++++++++------ Server/src/Server.java | 1 + 8 files changed, 42 insertions(+), 19 deletions(-) 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 3ed9274c7f23fcc1aa4fe243effd94e25cdc8e02..0e8e6dc75b2bb6fe814306cb9d14b0b1d5110dda 100644 GIT binary patch delta 6408 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%0A)$U!60#iG_frXl3~( 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 diff --git a/Server/out/production/Server/Room$1.class b/Server/out/production/Server/Room$1.class index 1a6b7fd910a09b59f3cc7d8464a0ed9126eb5bc8..766e3e865e8d5424dbc8b66e2a1b793477e7d159 100644 GIT binary patch delta 380 zcmXw#%`1da6vlt&zTO%0Qp(p#Ddx+^j3JY+1x9S98D$}nlF!6w3MHA8KfvaeKfprD zETrtnLM&xvWob1S5Yw*MW3X1l2xxCQO%B2-PO2gLLZxdX&#nZ++fCO`Uwx Op7N9Y!O>_}z34BtOGZfm delta 590 zcmbV}OGwmF6vlt&{9pbDg`u#Z2T3o-8Li2f!X7vb7*1J~2{8=OgUAStpdrGd0Sh7` ziEf*O5QfM=2p2Ad%1zKpTC`{p?t(UL+w_>|SXTS);(p)x4&S}sJ@@mnvF7PZfoyk` zAeHdv2?;! z>)LJDgR_`7w8$+jaa$i6PH@*E-_gg6=`8nj-taB=^#jfV!%dnja7-I%d)A;EZ&-Wk z8Ar*`j<2f>e=%~Jq=PMZ+V{6R`KN0)jxU{Hf6PW310;082GowwsPAnc+fX`9Kg$~D e$6c)|U+FJI3hf7>1v9&OX*T`z&#!XfJK52{kJva*472iK*^2k4M!|htj$=J6dC_#${{` zt@#I`X^DubBuM=b5s3)D{gjAABqF|5iR<3PPWJn*Z+PFmzi(ad{5~Vu^6mCLU@(^= z^kk8PLI;Z-EOD^Z!7`s-6ls=g5oprR8-3E*^i@O(62+y3Q;LgMD1tqEO>3+PbXO|hJ_zQTJ(_C6UiK+cZ9J4} zJ9=rs{T#3Zyo}g>4jK+&HHQsHIBMs5U2~2ZhH>0*f_zPlp_Y?|Q=B%Oq0Uh6;4F2T zbB6O=uvfgajEm$eydQrMD~gxJa}x2DOL8VHEGjHm)A-)g0Ts0$+SCv1geMy_v?G=F zGJFbIa>^!+{&Z%vEMbad7m-03nQWwMW3wI z^tXuOsVJUH=B21!@QBw6-iq>#@_5HcQ5hLehGLW`VS>DAgwsDWS~HR4e<2o@yZXy! zMRTKnyLO4EGEL$XyE>ZrGdEp&YNJDc#xq(qDfZ(pJu{hQ)6L*^tv>Qm&20We*^}lE pyUzUUHIMnN{x^QfEg;^S`)D#Vf9L}&6psJ}^cMDIq;z3B8I6vsbz`b+Q3ufG`*N~3K$M4Q%9HTr-Dk@4mQgVL&HbkQ=jW(=xyY{gh= zxpc90u|yN3O%qEW8jVP!h=fS^3;Y2jBBXI|CF(wW&OPVkoP5u@_iJ|FjKt{J;1E#E zeGmC;H>fbEG^jGDHrQcPK#inUveU+6uDeV;Vg+A-75oi0Y3#Ow&$PQjcl5A_I!V3F z6l&b;H8$!dX6!zLxXpfo2P6k24K`UEvdN^;;BXp8X!77D;n7`>8XPk?ZgYZ@l4hGc zPDxHn&h!s|5>~Th-oQgwt`JG}Atm5BD>>(Io(sxr1&Ug@D9G@~;uRHDu~>CH5^3;< zWB&R`xS=ZQcWB{~!)2~Wl*3i7sXEKQpw(e1Z4T`uB^?gex#4h=TMoDBbm%hZrc=`6 zaEH5U$jV5$M^b&UvaFQ+f|7x6mUIbQ{Yvd#n2E(C9HugzX?oNQW@_eNE=8;)KpAap(XwjkAflfoss%M^JxO}B_+A}- z#CQ7n!DD{X#~A%W@I;g|D7Nxcgn2Hi=@AjSM3k2z$ty9e?Fge{lo9cU*Wx{IS*8;9 zgVf1xRW3trYFAWt~d*PWbC}KIC2UFJGel*8lPw*r+~wi_^#J_1BP;vKXN| rm9a@>`6fD*vssn;0wSbV`Lb27FDK`3jf-u%&PA9x+S&-cz47x0bRm#f diff --git a/Server/out/production/Server/Server$1.class b/Server/out/production/Server/Server$1.class index fb1497e5b20f02012b97490ecc8e1b7467f638e4..a8b1a60dd14429e486aa3dfef87a52d9e0202d60 100644 GIT binary patch delta 104 zcmV~$zX}0y007|cH|R2|TTRMv1Jc!9L`m|e4ASu+-oR`#dI=?ElUTjMJ%EQ$d|w%t z@%b5r=H(UbLy@RxscEb0Xy{6$W-=?et)88}gMq7|n~}S*w~5l!$K2P#&oZQnkXeV^ I=6I?;{+A^e2LJ#7 delta 104 zcmca3az|vtVRlB<%}3aq7(+D~SQ&H~1R3-gWEu1slo<>ev>1#TJQ&Ov0vXI1!Wk?X ziW#gJdKhdNwldf<>|k(U*w5g^aF)S^;SPfv!waCwKMbA>{~3H3O&CHL%^89iEf_*4 I&*nS`0Ft{F@Bjb+ diff --git a/Server/out/production/Server/Server.class b/Server/out/production/Server/Server.class index 6e6b425a4d46f471cfb5b47bf3bad918aba50824..92fef50ff25f8819a45d3e52728efc2188417c9d 100644 GIT binary patch delta 1255 zcmaKr+jCP@6vlrim+q6}rlGl2r48ZI4mL$eYIXv$IdYN>Nw+rFFyJY`0R``iff-_ln2LTX6?OK)>_}UzO`~A{!4uJ zhrhnP32f!l2pbtN=7b|A?{F`Jijxju290@EamvAF$UII*c#eYNc?Zp)P0^ggHm*6( zIE*l=C^^JAYf6sUl+9z@X2PMuq{9oGv#G9C)D%+=olHA)aNd{;iW!GByy)-}FV9`? z4!xpyb@ApU%bM}}0{2+`-dN!3-ut*;^8nj42RNwNPOnAV*}`-oH&rW@a|a65(ZhvF z%`6u!LPsl=am{P=YA$h6@w(!xX;?}&$P&OVZ zmMc})v|-V5&K<8zyI;QTm1W0Vn!snEAfd)VjuJ>E#0#Z ziLX`iAVNsS7M0h-^3oCkNgnaDEFNWt$r0bQj{@6zzQW4ZQQu+Li8No%z!%)HjLt8y zBGy_bDiP7xN-=fX>ckeMLI8sr6FeD9OaSAwlMsSQA37xgQoadoZadi};FeLWN#bW( z{HURxW#aj^)zu{uUy~HR$pI7%c2got>JTD;YI z!87Bl;}fritcT!6ERykgj-o)MGUI?kEYF{&6diBT{)&-m2yCf^0c#LSzUhB4-J zds>W6XTtNKZ8b@Yb+lP@u*VYB8w_gBWX3be^M!0Kxi2#|crY_!agj@k%NAF->U4Tn zc&|}(M!fZ_u5&|i)8ZSp8q~UpdApG8u}8=4(VpS{A-kZfPFj4#DyQsCHs0d4LDlYD z*3K8=7qW%Hc;}(G;*P~#?kT>txX%q|fp7Ji^?avuA6V?rvchilTqb`y*)h>?j})@Q zd5ec^P&~4D%#@S$#Z<+peRg=qF_R<^#zNR&{imjq@B zrpuV21tlzrS)qkuN>rApnvon2|L}x_DNHjF%~K>QAEnqlk@mK+U8oE_j(N&osc=!f zt+Q08YnG0csrjCe@P@*|AVNYVB3=K|Q9Gw2T4Iq_^TB&Hv(%+$sZX~i$}BEZY$&m0 z`rXf6B6{hJ(7|!}$D~KCxJk4k8&^q#2#rg88M|1)VUBT>lpxcbkoDFRi%U*SvOZy_ z)Je-U+XbsD_RcrATl^rN=EK9!C-@b3}CMkgI;EXE^zI22)d|HG*x(}WWZKOmt- z2{r4`q{o66jr-fL2#X)pWS0q&ev;+NOl zMyGIVO_limB%&1ijd;}`_^SgPpvx6j6O1m`a_Zsu^&07}=62*iiRAlX7u7>TPE(TW<&@vw$p5oT 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"); }