From cc3d4a398a4bd58d9b908f8b4a10eed19518a0ad Mon Sep 17 00:00:00 2001 From: brausjonas Date: Fri, 31 Mar 2023 14:45:40 +0200 Subject: [PATCH] Even better server resource management --- Server/.idea/workspace.xml | 2 +- Server/out/artifacts/Server_jar/Server.jar | Bin 9215 -> 9033 bytes Server/out/production/Server/Room$1.class | Bin 2874 -> 2764 bytes Server/out/production/Server/Room.class | Bin 5192 -> 4880 bytes Server/out/production/Server/Server$1.class | Bin 3052 -> 3126 bytes Server/out/production/Server/Server.class | Bin 2582 -> 2588 bytes Server/src/Room.java | 15 --------------- Server/src/Server.java | 8 +++++++- 8 files changed, 8 insertions(+), 17 deletions(-) diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml index a256311..a2f2ce1 100644 --- a/Server/.idea/workspace.xml +++ b/Server/.idea/workspace.xml @@ -92,7 +92,7 @@ - + diff --git a/Server/out/artifacts/Server_jar/Server.jar b/Server/out/artifacts/Server_jar/Server.jar index 1c7cd0a6150ae27af6a2a963124cb075f1f38382..9efffe7722248db9ec353ac7008b906fca8334a0 100644 GIT binary patch delta 7359 zcmZ9RWmwc*x5nv`hEZbZlW+Z>Sj8`O-YfYh&OP44qv z6#AM**b_Qgac1={2Z|qItufXV-x9X%&O*1`nF0)D(P#``+eUv785*v-ZbDTqLPudA|t~46i+yzAbq{{Dj}-^zok`%Ui_!4uw62}uoKp}h}%)@ za!0kWn)!=Vn57;tpe7s$sr2Zx&-B|0nY+ug2EF z&BIyeHD7y5PwWQBu=`b(m39Z0k(H%Grh&!*%=EM^YU^idC$UOC3nDxVIh1(qb8C(U zNuvpGq{y0^u{jtspYV`}zt1h;cF=4;0KdA2qRer^$OE7}gEg@dJPX-Eal<;BuvP5W zh(sK&@1sa~UM@8iR3|f_TWvO9lb=#>p)9{euX%VGH@?v@I*txfW@-VCuP4amNs0Ko@;gh=6J>X-f5( zZmRfpR7P!haqKc86KYt8GxvX90%lB)Nc#SiOX2uqm}&7iRC6$mZZ?;7ol|uw>Len{ zMI#!-GO9Zki2U@t3XZkkM=?vx3HkdWo0i42I?(u_LlfW@}P$^(c_m4z(E^`?vg~T?gcjPpRCU;?kWW8l^e*OUde?79u`|kt zeau6=HZs4P^g!M=%4b_A zAj~{G8$77FpUwXv@#KtP07iG{cZSv@`cct398^VDrIT6Iu{$9!VHUS50mnAln}sx& z-Lg9p5ud|5iRcm~MPKXTLHzHcsZbb5j(f#Rh*ObA4eTJ8kDLi6Wy{oD_Uck+I49UtOj_!d9QrW)g{R}0 zsI;1MA#vLgT89}hWTG`eAsGn@VeoUMml&QJE;tmu$E*D1fTfo7P;;wYt_1oz6tcHb z-lk%2){jwIK%?|HJw7HsHk(ZCj6jTdkOkD&jzPkb{@L$fXfVd!WWGyzlv9EbpujGe za?T?eWnPk;^_BhIxQ&$QyGq#)5xQW|(Zt20u&vnDz(xbmrU=l`{uSr{FUNnA|1HP= zBgWH4_W_jGpg)^yYkAZ5??~}T)vP|ED+C_&YvSub7~7~YIs~c8ck86#QFh`}GZ-l4 z=K2x?9)jj-kY+#4#yVFL7FnSlZ_A3@S!avYJyiQ1z%?c*T@7~d&%l0?NdM+o{mYwg zH^B@$_aD|;`MSIb`gndJ@WcyL`(!cBL7w@c_n2*DB#x_v$nWU4s8Fz6Ig-hww?M2L zr~F04Gqm9&gB*)5Zo)1+1B16kaDHq7GbNF;tNqD0A#9$CfdO_dq($H`m7S2dnh8VxN)hN=qd<%{hSYif(TNDED~7t6c> zZA-Or(c9ymR3|r4UVB#}X{vmuA2^dDMO76;AoY#Kg)^V^!8rshE_bHlZd! zG+kh0A?H($VQ0PExkN@h6^eK;Zd}f%e4Wsp?F-oEt9G0v;-`~}_ zDT(olchGT*R(UT>M{Sl_%h6KDazKGnW5|WR_VKO;GM6SfCQHL$d3jk-wfS_8GO@U! z`<%JiqI|Gnsf%V@NCa;%lSi@e)tL7T<;;7qLycI&m5HDDfyc?EI8oQQ8r+Qb^o}(b z@{+8PjXm}$`5s}rg({x-X&e3vDY>`GQZ#~=qk57r;e3gvVwQva>FY1j?XCc|?qkOh zo0?CM_EY1~DCPjAL0!7vRE+T*o1>+^JoKWxbaci;k_6;!K1s)c)T4e~;S{;~yCbX_ zMk1WmgIDwY`s-d_&wXXKDMa+1w|Z;#XmD+_s*Tk( zbA7rH?*4lg_QGSgDKWoDbC4RK^VoBcdXw1d`wPS4^tL3_66r?NyMm(aLhQHR=D~MP zZ!sUr_qA_*#AGs7ir~FRfkss{Z{{n&2BVfJaXJStt7%Q=vZJGX}S`yM`zA&NkD{lVo_9d`P7 zVS;BE&rCk%G%X>wtGjwmY|L6<$@lQ(GvQVA<4?!fUnWM`gqr)qLCb}e$-n)DT)xMg zgo~5#?>0d^*M=#;X$m-g2iIczh|3^%O%8G)esEm6&{r`B&Y-;GS&uMH4nf>}hb_BL zZIUjz4cVB3ACJ?|;>Q6yhk9#T?%YMQI7exD-d|T2J|qDHX@P5rZiZ8jgDXCXNWLjv zIE7}BCR7oFV%SgfcXQc{ts|l1a)RS(N<`f2XXinI_Z}p*oliHx1fN}}4`(mbH98=j zA4k(~4%$w*g|(8I&L25gyb3F)7XLa`X8^4ahB$n=G^aP@Kz0H{7Z9{H>6s!YlVkTU z^BtRJRv19gCLT3M97J%0l3HzM0x@k8G$YA9%S)Or5%@@6<^n8pP=#K~JIG7;GU&!* zSCPu_`LMtdRfKN25;j2fqL1|< zC!V_8+Olj<45CQ6SPyD$d*bH^`&e*_YiPx`YeoLVTOc-m;I^9Q_;xz|=c*5~y< zRi5i5^s}_)BIFC1Ge+p3Xr3z4;M*P=SmhX>@bF!H<|}~Gu7pKXmB{J}Z9;QYz{)*o z7e=j582X1BSKu6LB;dodx|Dq>B$eEvm@J~;>Xp$@rAlL$!6L3eauUX366}4r!E4SF zgYs{P%sR=DuSW2LvtkFCN8G|kHE|Qa0|%S$IoUI?EUp7yE&b3+V@O`&zH9rLJh~zM zdTonx&1nrVPdNLPMyL@&kCTno8_KMGk5(GzjO6~FdW$RYRbX|A`n!I+JGQ&ek4 zu)*V-8C2TcL^pW2!J8lEoHa|Ex3+x>6Msl+tlgaCy1$r_NlT&>clUcOVcv&6`==3; zEkk1Nw6N#V*8BQLr;$E)P0&ZOK1)K)muTr)+)!HJpeWa8JKpD4OutPn%>DUkutCp5 zAOoClw(}e5lb@$eQLamRwF?DPD%A_6VEqsK_7@UvzBt!}hp5>|Y^r`Yfpl7H=A4)!y?>#WFykIZvszd(FUo^T>dK&qQRZ@oOu z>r!z9Fm~i)dtGYFszs9NZM!l`7lTD2w#!Uuilw5;E#@6d^)wpOyt)kMi8L^$jqDc_ zCd{1mv&YIdAr%WMnxGVg2{{WAy_`$%R?*eG_h*4>-}Rqp8mnKZ@eq04&4rx-KT1Ce ziIT4$C9zr=*0q${$XmKQkQ6#P6!MIgIeodUxryMX-xCSl;2x@OCG2c(KB>>>O`5%Y zl~~~@bmGJ(J|(u@`Jy9z$Gt$5v#8k-D8y5+wW9W8f(V|KV*Sto2agZPxnBi*#C0(F z0p3ai7Km3qX{H=ARg~scUF(`^bQ<5dud5`X9G10Sg?{kNc3?HKB@#~*K~qn*)i5Gx zA!cJJihAUXDL3>!{FE`~A;R!^JE7*U7_Y3(9iry0iB1D}(@oUoqs>FG#i3aZ&`G$; zYSiEf&Uu7a$^V)eiS-^kQZ^sbM*ETgk2@c-I&mixJsLUZdnZt^d};U0$j5y4SPc}v zVGzYnW5tq3=I+bR2w<(mo4+3JRPErYX^U|4YpAu#8SKr&?YRe0`5xW=_q^xn#AaQL zkA_A{@t@;f9J*f$1tl}!6hOO7{iddQ%28%0E=DnRZ-j|&%s(EcM$1(;w~EhLmqMD= z#>_*P#QuZzGM*}-fl^~Y4{tZJS!cbWiO2ppJ$3Bq`SJ1Ln`34A+;q=&_ICWa-4O>c>nPshUllTzsft|f$Aqhj%D_hfQ6*GlIKyN@;q(5~ z;!LhM8XoYnK&+Gc2VE;}iS$0NR1sD|Zf!6To#*F@Dx`WKzWy$Ex$|ly3zyc|H+4|i z!A%o9fA=X!yYluUR-nqZ1Y)-e?iOh1{vpM2wleT}|Ezvj`7RswA!Qd&-Fc+$395SS z(s8^6Y-#m-Rd64O6g)D1u-X<)dihZIY%{-}TUHutslMxTUY(5khMRN?(Aqbhh2yn6 zy*-FAuiNT~?;F3C*xV~6Z5Ko_q92>Ol<7iKG6;8=e4R&?_8#jhci(v1alBlg$Gy2D z@&gk=VxU2^4?CJT=0yt&i&=1uv}X4RF-lWzn2?9&y=gQsl3cD)s)NukcOUmG#r@vn zAiXG)BsIb_YtsU)S)e|CH|mdjL(`L-qSRmtA4=*pkhfaz3O|1K%zRJpj#r~2l+n{6 zW$twur1ET|hNXY1v5$9BFCEgf`UMzp~`GnV@|wP z)9PnXJ}e#BB&eot{YBkczH30|Gj>8XL`;X-W;BI(ilucBcuT-HkW z{koX4wwF+kw@YUsv*iLAK+Qf~SLObbK>NvPOxZNCtB5O)6QErz8SrF(~*UbCk1B*GSm-KpN^{-tFF3n+2UHZ1XOGUduU z7yDT00ct(Dm3=7KO_F+ud>cP33-0p92Ubv`e8L#kiE2d7Qja~AM=dWB`rzQju3#IL zk@|a1pB^C?2;1G2OjRhFaZ9<=rUPOPjk6~gSqO-tAcoMfU{ZKx`IetZSTp&W8ENVZ zU;%~gpq&dfV{x~;7h#BKp>EBOZ9+!kcBb@WnJJyM!g!H7b^v+`u4r2pPTf#(4U|C1f-`s#Uad!-2^Q)#gBX?LYMx8{X! zlv{pg&Cr=y-0Aa*t)+u_?=^3#l`un;sd7a|@mX*W?R#U&tmXK@1On5i$>yCr0RWpr z0%743&@5L5VMYLS*olJIHTi$PS#o;52U4NOiI?%|wcSp}pi>t|FwIF!2QoHGQGZON@rHUmo zZT2rpx6^!<8}LxI{9_l>^EG3Br4Wjx+Jy z6^|qFv7!HZHvvUD$VZeS>s z5^0&w>KS5YWWse%s2&XcYE+;-^LCn&v1S+U>dHu0X}!fPMetVb@j|_(aW4?69~iQa zA!fUe>}b4`psTgsKVaKzig^)*T@1}}xiu8VZ2g!cxjbhu*m{VvGv5g1pt-b7GgK0- zE^R69a9PbZIDNmULDbq6J;mGt!fClFJC6L|T6BCN4XCP0=?+$ZUlnHThQ_eYLMV%p zV-@0AW(qya!Rqbm6Xrsz>;N-`2tXe@CoJ;R?`1)~9N(vIGs|Lb*j`m2J+(@(!|nuc z?l+Zq>N@)Sxv2YF6>!-G$)2i2{OH}T$OUJjm%$fjVs^P<-Cq=ow@=J|(b7LeKyUd! z3>e7p?n$snp>kJ89LD*&I2%Hs9hnsLd@;~KXzp-l>O)H)`nMQKIRM{QDs5itmlGjO z{5liySiV5T%f_`&_Lhk}RUlfH3b}F1rKPt>R&K1l*?r)qm?7ZBf1PNR6G(VN!KM)c zl9XYDs^r#kI74y=BdXBD1kXzgED*7R*!u)OxFrg93&Nw(uDLc{GN0Ql$A&BZ!mY73 zdK+Bt0=aE@M_9;ME3AizWpraG<*?Jx*4yQ)5jmNA^5y0a`ahsTv59yf9tRCg>@OMq zms9+u$Hg>^z)K$rJE}KgZVku&g>15DC3Cw15H-g|o43Ol>FH3WsP$CE!nlp;1-`BG zk*yac^kk?i&JWM|!R~FIndms=&4efMMu|Y*O8}18yMNuu^z@^!$Rhv!hy0r+%QyEo zqrqq$UL`m=f-{K})^$o>{S?=huiqvf+HOBdd)GGzgWk&CZr}Nb+)CQ<-*LjSRkrG;DJx}=;pw&P&>tEJU+E`xras!PH~aZi z@QZ3Z{PchCHWtCin0sj>wC%sOw3UZZVUv?cP)^?@bkNRMlCxg8c~)$n^fU#>i}|Uh zK|CU^T6o>Tuyaw0DNQK5u$|^DOTkk^{IFm{p#4y-BvsGfY`C;Ytwt<|PQ-Vb)kfJQ zDz2GqbC`al)a}LiJ1diQgC%M%G*uNMN*(zU-QOURj0{6R*Tr%4%c8|U??Ta723q(Z zCl}e1<0%`6j;_tEt*M*81!)fRVme4`5|~4n^z=AE&E@q`PF1{%#uW&?^@+8L79$4` zP<^d0ommvm=bAhpQ7!ZXrZz%xRMMb-`wm4jqwCG1Oq=_C2)^31M<4*Fr3Rn;7?=EcLgDQiRjElifSHcga{K)HhhV+Zw!$ za#AAXUr)XsuP$sY*1Nf=26*@$TpSq#O|6Y(nj_I|YFUAKi4~7|<0f3ook(udX$~Z} z=Z1@34<#nqo!OK)az6bgS?O$I)CwWXunh^3ZgZ*9Fww2T)=@Y`Hq%1drl_Z*ogKt~#w z$(4_3Db=JUNkgnME7kvAFId0-@})Z5`qQN`1`RAN?)9)YZzAWjDWM60HGjf-WukiI zH2Dy`C`Xxl^`})XcjVM7JIS;8T&ITD2k$?#J=E=KH8MZ7ha0@LknO~-y4fU?^E0id z`?A7@Jv>ABN~GIqKy{(azXUhh5eRyz2m0AVALjZt4}1$qDnd1(hg==U;H57NubeqZ zzfas!_=;g0*TmECcWl~QRz5i%gDKM|>n-68V;bsSEgQ!gYFP0mZJq_)ur!vH&1u(T zx46o|8A$gsaXCN2Q6M)h^n`#pr9zfz%E&sA&&STNE3Tp_Bz6_O<+I5^8Qs2Y4AW@w z!}=fVzvcDBgFgJeGEt?c25KZ&rC^cV&y71`b`lcwm#CC?;N1GLwd(h@3g3B0Y1umc z90$>G#*N~gTWEs=i80?02M570rhV_fv7mP={uX(-TFflZIEO9>22`>qTO6+ zZT*L(sjC538@p2JNF4NTWzR>cD}K)B=HNbUiEv9#jNZ$ky(PwEa{15*nLK>?JjO&_ zO}*4Xbmu(*5KAA_Rq28uhM5?DzN44)7p;pDxP}CVrG0>Iq0RpbqW^N}lwD>XhJT*^b65EXK>r(3Dcmg7W^sRO z{|J+Bw@ZW!-q5b1G{u|rWDFrMN7#|r@ N)>#;En3(>_{1?hHr?IbAky94D4m-wsXqden@x$JbR&(F!j@(uNQZRC29)m7=W^Ze zv#$Gj&-pOt%v!T%J{`w7zjIjij~br77AhJD2@4Ag$-ut}F9j9Fz&|q=l?_ny2TYOv zEAalw4ZXd=tU~+_o_7BJ`KDk`BNNKVaao&_&@b|so;`6%g5@-jEPNkf`Bh5ueet$; zV5jhqdE55Rz#~uZJ9T{$q2Elssmj1D@mnICskF479M_F_A$C@3okynYEE)PQK&#)KUx~yCo9gm zkWdMdJZ*uvpmi!}r{IVeYcxvmEJVAYPjFneb1z_YFNi09RMD;zZu{<7<>-Hu&{_5o zJ>bnS%++gHxi8@&Z$0Q--;I28;)kGQ$kuBS`XyS8H7_p zAeT7`{c081Hp!mT+9?W$UW^bWgQKE?mz;w3N?e(Co1amOcS%R1G*p?3-y<905{h~# zkxK(SH-W}7RAhLXj0KvpS7UKeMTvL7x%-OrJCYDnH6?^`kVrDr zglbB(g8?DdZFDkhR+F54<8+dl=f5gT7IpzAAFJb1%i8vi*2))zMiF~E=0_jRdHuEf zqNaZ^r^Bm?ht$2}hP*R>eB`l|tmQZe4f*Oo~?v;*KO!r5zua$#||;8a%#|`05-OhIY^>XPu8T`3SllI$D5q*+`6Y ziiD~pXr`({*e~(g_5|y$e@wE+xYeXdZgb6a?3CYFpPMG<@(jf|#<~D~f>(I;u=Cop zAG_YLyWD3)T{sNnMrz#1beK8Id<95=7ABcbY9JnQWq$jx%-3PIAbzO)Oz(ZLUEMigj$!e!am|pH|S1ch)vqK zaN;*(ZlLxB&p}&fJf%RMLbA5nDr)$sZmyIET61T0$dMW|E0E8g&FG5eD(MPX7byrW zhT{q>$h3^KtQEJWksN#im+A42ZZIRVU1dk-rIYBWUS{hReO)jJqRkb7*kdXL;z}|d zH{&sV%MHy zl9&X|Po=8p9hRJVDdd4`jXnxM{}zIY9IZ#y_g=J9tQY9f^!v_gurgD<{ZTY5OfdnR zDa9bLIXhLT(|nIzzs!57lZnpx_y<|H^6Y8$`}POhSB=0S(_6Q=oZxjOoz%d!KcO=Y z__M6W?wF}FnKj$M{<}~X|p?l(?(a6*LtodHkhke4oSTzX6<<(e#2uZ8`{t%LQ zANqJ-Y&9Ruc*>!g(ZtePw1y^?kjx`C%OR^;!jmQ@*n}tAQ2U{1j@C*`$3)P=t zO+9_?#XJ)Mh`Y~OJ`V%ktoJ;R!`;0v9;v;I;{Kc#3Xc4NgKKo?`*}w`V(o@Ng!LRK zoW9@@>`_-j4dCK|q@7?*_kJkeRg(!t$?a(ETS6x;&kc@E1$4>5QFu{MuGMe`AZLSK;jc`7KF} zc(gHEDjABs!?}VFib|U^XUMR;7a^|;#s4vlP#3kkC$cIedc@S%!o*54-~5z_j)WwQ zi-h#Aw*UWXj`RQ2{6AVgX8tO~c#iB(zJ&MQn6|AV76u-`O3kS$OhgjRm`2IeyP!cD zt(|~zc%JjBFV>E|>pgNb?wq2^R1$h!YZmi#MR~NM29bVsotBoBRp)&5YHQGo->!0l z3;t`oR6ZNcg@4`(oUDXRNZqV7ugm07J`bhsQMt{=O!=(SGlcF*(rD4cfwpoy$hJ_j zNq`?5y4gz(D0p3M@vqcvW`6pt29BiG&(%Y*1=;5=J)#L%nYYD%Ii5S^63}!iq*-2F z*n~&euB7VWo+C><--gEsKh;J}ygDNaa=(Se+1P6L_1kI>cuCNw`=&+-fHsmTi7Z~6 zpW3}3Z#3&MgN1+|l+Pmx>HD{ZWr{Y7C|(RQ;m3Reyw!W`h%aJk)Eu83!iAbPH3SO! zeDPn*oQf*ksFhaCkqB-1is(+>GplyHosBlbzOs>smnLE;8a%TzPaJFtktBwyyx+H3 zTLWW|3VE;_t(x+-Rj`o@W3wH7gz#uV|?8rE%|Lj&L#^>xwxF7;|OEh`s z7He({__}Ke6GLa);s<$tmODBX7iO6C$@viF1-@jO0iMyu;28S zIW^rUgQN2(Z5@Kx-z>oyQcL}ngM|z({lwx*HXI+n75#+m^|7LewvY?Fo&Nz0vgu=(dd#7CJ+ z;MDKRc)j;ttw7=^$9_(O07=uICos>5$zPdR!|&!Eug)nz-7YK#I2C$)c&w0(LxR$Y zANu`bL5e1oF23(Xa%HLRRRXVI>NCsL%gUKlEISr~{(cmJUy}1u zB87Ts64>gB7OCI)yh4++0nJRk4x&q*{J1ULa_HKtNSAHj1x>}W!!G$XtIatCVVyj5vR}WRt_Rvb>mo=W~P0`$o*(}uqRKW zq260o(z+YVwEZJ%l$9^43~|y95T@|VwupHSmh|76EVl2flQcK~K%pmFD){R&XA!Ug zFIm}%1p=Y4bG)fTOq9rPcljkI71gfvTKB}Z(`OFKVvov0dS@bZazo#xBVU^V0Wj_j zF<8lFwshp17e8uo#~z$yGNvQDcdV|MxJK~Dkwej7XUi)!V= zn}BGj4=eN4$omPY-D-C*IBO{Y7$}Q?7_Zn97)8f8Q5((-R$``+wQ57<(?s0uyky)g zoXn9g;>xJ-Kj6FcA^7mJdxJC&=6BrmPFB-(nbyp0cjagn^Anr`o>y|83_F}t^3A`g zW&ZVZIvghu(Slu&`hC|T1EN}fwE*JtVkcjG8gqLg7QUOebiH`DBCIC^u#=6&9XkD@ zB+w~Tb_o}k#!ZQxa&u^AD!F=WJ)fUg$KcNqIr~Kav(`uP@}uRN=Q6QgeL|&;Xxm8P zP%bY}l9K$XhcP|_Y@b1lPi0!g*1DJHCxCC=$vC-n;}STwt9PNHZu%i{?{}>A2*M=) zeUs%esu^QMf2fl4fOgpf&_+$@EqKJb*G$W+yAqtV<%anwkXB{pQ%1ySY2E06{jA$f zsWk%z!a4Q@Y09Hoex&C0$GA?0!Ktcym*k+%Ur&OI8QjcPy;Ssw=e%8ijk zP--q(IaJd3ea`UL8i^B(#3I!kp%QH8zQDnNJ@>{!5Eh?PvR~8om(d5^#S=K3mwaf6 z%D^?WvUca}53?I1st~L$+QX^_SxX^Ju)o1r!^h37Tj4JU1Zy~s0z^&9Duc7le)TnT zeI+dJSa>Mw94ZdFs(O?fyd#5LgTJ=d3}sp9WM#dx(8n3YJO^*!&Ik(SN)JPzxei8 zZKRVfxl~j(u=f$-SN3Qs7v*wJxp51K7u|wT#id+de%50a53lnH(w14<$*Fr+P1fmq z*J9XeOE5x>(54wG2mU9l29=4M;bWA~BO-m=Vr%kEen(+cqe(7Lh>dc!kDsXL0<@{m|q2qb{E zocWpB_HC?RN7Q(wYNW8(jB-aFy8)(7Ma{k<&e?+2Ty1|qM|#Edn6Z*oNLQBg)KAge zwc=zl%rS!%Q8TU*jB*IS0sn?C_n6tiwdd6@U%f`v<)(gY}pX;XlzNkn@KcM!7hO;F{CT`Sv_S+BJu~mg~=TT>xhS!;1 zd;B4EcvU0&yz4Sl&j-^tjXns6hh(%lpkGM&L|rp-x^NPYDqyi+9O+$fP0I?e#<|Rk zWHn|`e5Ld!p%0~5UXQ+D#W`Swi9(L3P0tvBuWvpDFOrxjnJWpL?S8bos*_A%`CD({Z+tHV9 zW-D|l-T}Axbq$`1^M98qK%45G;x`&M?1l__b(MIl%gMUGdRt@u;mgmdUtdo?rK_}I zgeD=s%ln?Yt-iDPEBrA6tZNT07(0Aeh7tU{@C<@=k3B7&MULMc*mP=ZFnk_`^PkLcNn-NURSv8{)6(jL|qUCrJ4RyfvSW4yF@kkKfocA zpOhT<=}&3``m-v2;MIn!gNhz)jAN{Asfl|VMXs_GjbCvAAI*kX8~r;WetA-#o_Mr-*3sB;ZvxGn z*O6UXnv_wSF^O-Zlt}i9)M5wcTd;B)sIX%sdAAZ0mfYDEG=G4F)%us|3w}r+zIIE z&5H{q&>4(T&+_V8)zEZ2arQ?~QZ{Wkg;2y)jzK)|$mlwX!DD!r?xxw(xvZK+{l-~4 z{DaeXQfikz8hCyKf}%BiAIoN_>B{qBm&jN@&yG-v#?$)DAqys67>R?F;Jse#hAavJQ88_E%+)mMQmSxhcyHuS5Wo@SnGeTf6r zT(sSzqYDHxj~d#`w1<+}>K=JBRFueOyV$Ef%5#QoUevVOV_yK(S<~6yx@^0W1K6`} zBkUtg$b4_PLGtHnv!mwKZ3YN_p5Tb)Jk-oW2}<{A?M$)!534SQ(O-GD@qi!S%%Q4O z-zOPMu|57l7!Fj!nP)iTer;w{dpa(;5dV-Ak^F35WC|x3R7-fRCwFInPM7u3=!s{8 zkIH*n7`TE$g3svJzY1)lhI4MPP%&(iA{UO_;uWTH<=nu;N;$Sas7!6%iV1i12=?cF z2v9X?4Y-$Qe@|O&pdn$E3H6T;4}XR- zIIi^QpqTNot#UB(IH0vtI+I~j_Iut0>R9X5u}>2oK(chPFWrWcWAFid9?mHfcot{$IFT`u%PiH zoJ+c3y3EE^&qGpixJvT40qkCa!IUZyBiNvEVyD&KN-H31vqP;_7y^W9exhOb>8wB1NCU87V>4{y8#JvclIluu3TlYxEh(suADk49|U!v7Gm^8M`b~_ zR)&ULV@0>3pe8j zd8RdQ(sMR?hKCqF!jvaE-=Y!h;{-boY}*_AB!o|_2t}Y9n%HHz0cKq2+uJADN7NR> z_{xTK5^5cDg?1jdc~yj=CC}lZck~=zXJSSN@mpJeO0y|zRY;HfeFAcX-suoo2oWLb zI8@0HQT8AP@V^{pxKu>Ru?a?HqboffIBY(J7S;NLP}Y-KPQh1Na>-)_P6~SDhQX6Y z9f#b#O=6L1-sn5L0KCykuH-P_ler*-M{1XrKK1(yFNh^cK}etO zvqbWnF?(G<{ck0E!iuHlAP;j>2G(2(iHCFk>=ihqNFaI1uGV{FJR$2oHF)q@xs8xO ziZC?_etKLX!{g&lFtlr$Ul^e5>WOG?Yzd?E<9JVomHuP?o4@V5mzchCcj;;qeJCFo zUQ^ToRmw8eO~hK03d2qK%S|*wmoMe6w>ZbLCzD?kZHeEX(cnE|(*T=-#~WC`;RbuX zLgYQzZ6FQ{%F2c3dCoZFjcEL71OBxP2#XI}a1pjQeto({RD7%toZ>I}+zeDtT(%8r zV^Sw4wuEXcQ&(hIOS6KQxfl60zXc_Qi7jgb-r^Z#TIMqJ93aBY;^0rq zM~YgZ$eOP=1hv&&XY6qY75Vtu6>(a*vK7hNbIWZyR#Q52HNP@%*%*NIZ@)oisD=om z(y9X~;vs#crwf- z=c7`!j8xU0x>c4CJMY|gnU1J;e#xs{-;C=Ljp6=y9wjoe+GibM-z2t_h#1SC^0eEQ z8}S;{Z8`%p+fpHCdP!m1$(_NacP7>L(K7@M_Lrl7uC>vdQ# zevajukgc?l4v5i9S=O_S)K^LygBE8h{hum|ty(Nh42$i-Xx?tI=^AQg&1L54XU5

;w?L)W`K8(kA>BgvV-PM?B>q?T3<{jcy$a62G6#JG#Rgm z1Qdg(it?$HDe%dYEn61Gd4FV^^UfPcIUwkCJa9F?ZV^^5>KdS4aBy`0ZULuCzR?fi`*L$HS^PX<9HyrJYyJuzD6UZ*fEya4(YKygR$L!WY>0H2{osZ zqO2XxS8W0$`V0aRzxdyIxTzxBLyxqRb%u~=X0c>oQqksSc+HMzxeN>lVYUlf8=Npn zZwpWQFV4Fq;rdtX7U{-3->X$p3nEa&?>4at#Xm~(U(l95j3xDoz$*^-IpXOrCGccS7`%O!8<&&jZwlyrlc#50Lb zdAm>K-==T?_*kCL+?)gwVs@A&TbYDXM+Q*(N-q+gMWv}fli%kLj)4Bia>Ot$C26fH zrZAK^0<9BwzA{G+ng4I5RgExOiQbV!mHoz1S~bL7{0w>L*O_8U3nU?G-Sm8ccsh zI4S?JH05n*-yQ+8UGaDMZ-xCD7B)S zw7{`VGSXTyVKI&}2Vp6bHXPq+ViDwO)GUSgu^og@uwPjV@lUi7-ci4iyfv!QoqscO z?H^DP-HI>@n)3W%F6X%xS);%2!-j-J1!?qv;NTDy5H zis-a(JxM5f9$ZP6SHW1BIe=14GQTNGmy#nf{DUNI#Wg<37*VBp>Zu%&3N4wv7{K%> z@gq^vl*bNB04>}I_8RnBq4VMvPx*6W$IieTp;5zhe+(9<@f+e$X~Z_GWD}(M6f|BY zH#~3TT3(~w!TzWF2k=+A-^-uBO!{O{I(e?R_m@PFeK_J4Yu|DodgTF59Mr2p-W0;d0M6$Jkt`X|E#W!5v(GX8aq ze;7J@?-C?(Hz|+}vhrIosNF?nip3*W9MLmd)0zJLh)&mAAWi+zk)>$X=o5sgp^2>OMA}lMlU?i_j}IyKIb{l z^PcxTUpT%X{q3#u7l9}Ta>%F7qkuIYt6A$3v$!sY`&sW%PlHE*MwbnCdZTp@cx%^nZ2*)BY6U5j;FTpn?0b$L_~8r;`AP+BXbHQwLfw_Zs7;Wwu|5yWI$mva9F zRaM+(*veyuLW&HP0QBi z7gIgY4fggQFzjNtVGmEZ>@_5L(vYIt(8E(MPaF2pYuHcR@QiiO(l^rR_{uL1B(_9r zV+t>sO7#p3ltydi%s z8Np^2i!Yo}cr4*=8G$zwr$n)o5*r1|gNbo&DS8!S|EQje7lo)4J(34Pmnqk3Ve_?2u%JnCMb!wg;2~`TO57n)l_j*8O zZf7#i%PY>IMu~K0F)s_jiyvYv)uYV!PlT4t&y9E&!U-MRmI%x${qazRm)++~M*Z!- z61Is-+%=M@%PkW=>_&x;xHjpO8=V!O&M-ME-Wayxp>So+?Di4QzY?sLxykV2bgC_z z$;-kWpJFo8ZPHf5J=`nh#`J{#K~Q7M{gJieTc!LqQN%^FT~zIq(?N{gG_aQ@`Z&fQ zry1g7Ug8hoe@UbM;Wg#)hKlf(Y8Rg1ZI#}|5!KC6b&z*en&avaAE@sIFLP2&aY|j| zjJm;DXC0@U4SeEk;xi}Cm~%w%IG;Nw_|iGc*UkvvI5&jfWZb#McRH5|UBD&XC43K; zb&@IlJXiG)KkG5!U+|0mir>HGPRc^{-r?xmNFxD;4FjOzP9TFCRcDWpYLS zonz`%c4X(&RjGPr)oGRxVtGauR(V&k>&&tt~vw1Fw+|Sut?CGDVkaP;8 zudtjI@-ix=>4TKsmN@OQQn^$it~zhpew8);1us!nEk~^tox^>s5)8<{Bg$REJlQK> HP@ew)m!sb2 delta 1305 zcmYk6YfM~K5XXP#p4~mWx3_h%LXo1@76eKuD`k(-Q|e}Pds4QZD=&?Q3QrMyOMbkQJx?E$rke#Io43*cB+!h zCWmJBI%IRBLk{a49wg?TQMuVIv>Ns~w6WjN?r?yE9^)bRJC(gH&LM{m4jU2<4|Bw! zlP*KI!%=!1dg*iMXTb1?!yrkAAz}{0o;b#%?-y9EstI?;kHt%S;(bR-n;uUNC3+PZ z9m9iziN2xcuHMA1uAZK*q(T=K)hXP=Pk(>!*1DoPcUrgAMI)8h z7}1E7x7K&A)kqYLexXH6=@; z)GEP%;7fu=@Umb~F4iI_G1iBIwuDM1o)8>$-}SFmVRyhERT=KMzc?5U+aCp6wQ;ux zH@0Ow?Nbw1CMK+r)J3k3rEp~m{O8`l@l-v{4KZEe%k(WdPO&?!X8Ot|NuTO(ZcQ^* zx=)%yNjVlM4yB#pfR|Hj^MU-UHsc;Q8^l&?ishQard;$h=2}cB9kV>>`8NkE#6J+s z9gQ`l(%UIm_5sesr5)0LM>>6*^rBMF>5GCI@0Bi4DY8*|(m=*BV diff --git a/Server/out/production/Server/Room.class b/Server/out/production/Server/Room.class index 8c66bcf41ec718dfaeed8ca93365575e235bfbfb..2bdbdbf3d19977f581c304753394d45b8e2f3609 100644 GIT binary patch literal 4880 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 TLfsAAz*nCBN1yNxa{v7sB4dGe diff --git a/Server/out/production/Server/Server$1.class b/Server/out/production/Server/Server$1.class index 19bc059f2db6660b1853d979f123c4c5a77c4d51..8ece73afc0e8b4ebf39d400c96703f74d509953a 100644 GIT binary patch delta 1361 zcmZvcTU1n47{`BmhM9flaN;stMwOaMsLu>WcYcD<3a}TVdZ-Z;aD$hE5&v*a-_jkTMzn5jpQ$PMa z^&PN^X&=jJG21gX)$GvhwAsaOn;f3iJZF@!jb@LrL@ZiuqO{pG({9WinwX~3$MbaA z6wqxvJvRBojnr%N0tp{U`ZWDE@{ zqZ~5j4qF`29JM&6c|~(vb7J&|i>gTElR{dkYSsu7iOCGO>PlX9NE33X<4%WK?r>N^ zC^O|+l6%r&m{Uf7E%U3ZBK10N80EA>hBFFJBoR)^vEFnz%Q=U)IPdT_?uxWq@A%MKqiqWQ$(Q?4k={*#{R zcKcJG@wuWjnCy>4qRC`ie^=MOU?dR@_eEQmIefvFny(zbW>lfp%L+P-G461cZxr5! zu2{6E&wyqfCYW^imMKN?rk+?|aC?W;X$`i;dSc0rXse>=UjmJTk!WvUEI$6HJ5OaA ztkvUg&pLM%L79hY6g9XC3QYGvex;Q%GcH*xxJ$e%GZ(Dj+Et=^MT2`;Eqm!)L_T+O zk7&rJGkL;U{2`MCZntFEpoTMlSu0bUB`Rkw7Qq#>tV^;Cl0TQmW8Zq&;gz0rt?%yQ`u5m zQys7-xH;ro;JoE~y!ioNmRmEGc6};u1mFBgg`)qqIRZ|Tk#84yR9fRvL+UV9xaIPi z)-08M9UdAeq>&09l3UXxZQR1sJjHIggJE{kDN?UUX(C*vjh|@eXX5-qg5MbA5B4*| zft2!+QY9Qxl^j*|98)1qs5ohr;FKEVv>M`^z@Je^IIGffH_R9BC0792xsNqMBrP=7 z3MH@9C}utP;}eK953oW0FJ{;)R5xHzD0MeVtcwa2;XxtpCRM3+@vxN15de!#Y&Jun zhOZ5iM;+%88AipU0=oxmRu1XWG-)2wJg(WIc>=5%;86t#5Wvm*BWMvwa1umtwuEDQ*;`U{+XZKj!;=se*M%-B2cdCob{Ip=%Md(PSQihnQ4 z{QS>_AAno=F2oA9*(2^!Nvq~Dm&e)e5@3gBr&XSC(Io86E|+GKR^6>>)9eY+PKV1v zI<2M4C6{h1^|}N|Jmrvf8$=j%*~fl|0}ewL;VBz3ta;j{jAyJe zV&O6l2VD+vSo5sIbDATX=QS^k|9Dm{7I{=EmO3?Sq#W_d4*6;dUNjt~&TtbohAOHJ ztEkIf^p(_)8eZa<)n8T=cO~{EYC8LB8WZV6(_p%PFugTB(3aS1IL<59>4f1Vrwmz6 z8(!tLY=yt1@^!--oU!IN4R7(bmEJMD%X^yl4Igk;^P%A*KF;>~mnA=8Oi>t34JMOq zsnnjqo}Qs-QnIAmc9$7GaVQ1wDl!*jk4FKWN4Vk%5Xcae$^_J`f zC%Udy^c>OP4%r7}GS*`ex3OBdm28~UCH6WSB@n+zgbOO2Eeh3U>cq=0WHC+&+4!YG zBXU(+c^);*f>^LR67(=L@)eSTsf6oH>7ra4cs|UOe9%$?;gyGC{!%h4Cqh z!o?nu`3|CH!q>>@aji$m80V@Y0S~w3Kc~Q4l9>L#ODE!lOT*WBTpx3;q>gBh=ou^5u|~98YyKX+2%{Dv2omrE z()uknZZ7A++Iye-9bd-%l?k5+5&&FpZSuA?^8QU~e*4^E3BKuNB-gYTh^RZncp*tq zyhNUg$SYMAH2INx$veN)<$P8yLl&2|ZaF0A@PRGGr9oMga$zAN8|;gG;3#hnTsZOIl- PX1rJuvf=G3Mo#$w`g9^B diff --git a/Server/src/Room.java b/Server/src/Room.java index b8858c1..6b72801 100644 --- a/Server/src/Room.java +++ b/Server/src/Room.java @@ -31,12 +31,9 @@ public class Room //tells players turn (array index) private int currentPlayer = 0; - private long timeOut = 0; - private Timer t; public Room(String roomCode, Server server) { - timeOut = System.currentTimeMillis(); this.roomCode = roomCode; startPositions = new Vector3[4]; @@ -56,8 +53,6 @@ public class Room */ public void addClient(Client client) { - //the timeout variable for a single player - timeOut = System.currentTimeMillis(); //loops through all players existing and sends the needed information for (int i = 0; i < players.length; i++) @@ -100,9 +95,6 @@ public class Room //read the data to the buffer input.read(readData); - //reset the timeout once something is received - timeOut = System.currentTimeMillis(); - /* ---------------------------------------- @@ -407,12 +399,5 @@ public class Room { } } - - try - { - t.cancel(); - } catch (Exception e) - { - } } } diff --git a/Server/src/Server.java b/Server/src/Server.java index 7edd4ec..665e86a 100644 --- a/Server/src/Server.java +++ b/Server/src/Server.java @@ -52,7 +52,8 @@ public class Server System.out.println("Client connected!"); //create a new thread for the connected client to free up main thread resources for new connections - Thread t = new Thread(new Runnable() + Thread t = null; + t = new Thread(new Runnable() { @Override public void run() @@ -81,6 +82,9 @@ public class Server /** * !!!!!!!!!!!!!!!!!!! 0 is not used because of possible empty arrays read in because of inital connection errors !!!!!!!!!!!!!!!!!!!! */ + case 0: + Integer.parseInt("crash"); + break; //this case generates a new room and sends the room code to the requester (not for join) case 2: @@ -139,6 +143,8 @@ public class Server break; } + System.out.println("Init Thread finished"); + } catch (Exception e) { System.out.println("Client disconnected!");