From e0ebddd14060f85475b7faa6d87122af3a5faa44 Mon Sep 17 00:00:00 2001 From: brausjonas Date: Wed, 1 Feb 2023 20:41:50 +0100 Subject: [PATCH] Fixed Server Thread Crash $2 --- .../.idea.FlufflParty/.idea/workspace.xml | 1 + .../UserSettings/EditorUserSettings.asset | 4 +- Server/.idea/workspace.xml | 1 + Server/out/artifacts/Server_jar/Server.jar | Bin 10445 -> 10521 bytes Server/out/production/Server/Room$1.class | Bin 1657 -> 1657 bytes Server/out/production/Server/Room$2.class | Bin 2288 -> 2251 bytes Server/out/production/Server/Room.class | Bin 5233 -> 5390 bytes Server/src/Room.java | 52 +++++++++++------- 8 files changed, 36 insertions(+), 22 deletions(-) diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml index bad43f7..1d5a7bd 100644 --- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml +++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml @@ -113,6 +113,7 @@ + diff --git a/FlufflParty/UserSettings/EditorUserSettings.asset b/FlufflParty/UserSettings/EditorUserSettings.asset index 2bb28f9..14d6805 100644 --- a/FlufflParty/UserSettings/EditorUserSettings.asset +++ b/FlufflParty/UserSettings/EditorUserSettings.asset @@ -9,10 +9,10 @@ EditorUserSettings: value: 5604555501510a0955590d74437008441216412e7578276829704a6bb0b66c3a flags: 0 RecentlyUsedSceneGuid-1: - value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 RecentlyUsedSceneGuid-2: - value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a + value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b flags: 0 UnityRemoteDevice: value: 225f4d46245b0d4902070862342649191512 diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml index 40577f2..6091090 100644 --- a/Server/.idea/workspace.xml +++ b/Server/.idea/workspace.xml @@ -79,6 +79,7 @@ + diff --git a/Server/out/artifacts/Server_jar/Server.jar b/Server/out/artifacts/Server_jar/Server.jar index a51d41ae02d561bad77f33e72655a993c72de685..a8a178562f650ea1ab91788cee7f0d3df60b44cc 100644 GIT binary patch delta 5280 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 delta 5221 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 diff --git a/Server/out/production/Server/Room$1.class b/Server/out/production/Server/Room$1.class index 526efd8c1cde8e42eccb19e740e66ba0547fea6b..45ff557ddef441281d464c3d08e342cc5784a69e 100644 GIT binary patch delta 33 pcmey#^OI)-C!44f!wd#{hM5d5467O37_Kw8GdyDOoGix{4FIMT2_XOg delta 33 pcmey#^OI)-C!44f_4FINY2`2ym diff --git a/Server/out/production/Server/Room$2.class b/Server/out/production/Server/Room$2.class index 5ef41e30ee578bdeb1c0a8e2dfbc943f3867758f..1deb515b65dec72b7bcdee3b50b81bcbcba8e795 100644 GIT binary patch delta 466 zcmXw#KWI~N5XV3FUfxUIBMvG48AQ_iW_E*`@s)I%d<=)aLkkf_l)Oc<+>SlVqO9l2V~n+oYCG25K!2P_+bn>yopai6}MD#S5>#^=ME_*$uP}%W*BCcDat&e!U7N3)ciZ; z$82f2!xI`jlOzk0;e`zHQigaXd0xvnZ=}duSyQgDB%fK9I;(2ooqVGzzgXpj8o8pD z`rA0E)@HPhF`#ex`9G7ZT;A_xWKkb=3OlPSB0AO@(Qgu^M_2jsgVQ=Jgk_5aNxeR$ c{UIWM^*B4o83~d`!&&bS7tKm2YBoage~eFDy8r+H delta 532 zcmZXQOGuPq6o#L7#{VDxX3|EqQYn~=uWy|t%8RBQr*i1748O`gn=_niRziTv^EE1<= z6@6ASU{(FJP$t89vQ*g3Fo&pKV8rO%;4-%v$8{64oSIAg=KdE1~WHiQ3#pu99 RXYi9FZnUvUE8J9L+i&WGZn*#e diff --git a/Server/out/production/Server/Room.class b/Server/out/production/Server/Room.class index 2fd2495929b83e81e966e5426712385f58257338..7bfe3f95a34d94650e27ee7118380e743e7e7b6f 100644 GIT binary patch delta 2685 zcmb`Ie|%MC8Nk2Kx#!+c6%tXbG!aA#ODi)a%M8}m^PX*lME=#?-Sa%}`}};L zU-$6YD`JV=-H-18#t11C^F0G@Ghl@QD-Bp>!0j$mSnc3D+~KO|YIAv~%lEm<;cj!d z$1Z*f?BXtPN#h50afcqKsBMRPT?Y25+~=^yWia=Lm7$-+$aKS7>+r)AHTENibuKxq zj`D!P>s=n?$5C2Si1JXB4N*3_{De(WHb;5bh&*Dzqb^%`%%RPp-DMP8UGhjq*=BHu z0iCHl&URzwi4+a*rv~guVN4oNx;(|x#_G>fc!p;U^_;^_qp-_>pBw$>O_;kKUU1mc zc9uLSu2L^Lyrhx)uUL!RD}vI<_{>pGp^&H+du70QSR4i(U*DT1LSyyvi zykUac`8|g`-l56iU5`KTM~^@8p2weg-{UU^e8Bq-A9@_-uO1)qH;2D_e9S*QKH;DK zhvCyQj&RhYi+_1^)8x@ZQ`?|OwiR`*iZ@hvm&Y?!tOIW=;n1Y)SUZs&>rz>7i0p!0-09z) z8ZX>VPSrNf%ov?ym~w1;L6TUK&m}3yOH!y;sd=4@v6$UTO0y-cJyrfdFMrI~boYs9 zRmiTWvh_c#a;Kb8(9XD)+bgOf{ik!y$>~3h_w&+nvWoN=F`^?v>Cq$;9^tK4y(LjNaEkzP;!+O%_ItiLC%AW_t8>(e@0v8Qj*D(si# z(!wNJWlgp&V3IY%T5q*7NjavLJIGg9p&70uLn}X2>pomL=V%Ss7LdP(r6-Ba5|5Et${h0Tt2MChEXnfvpjaqfV)?mDSJHK>D~E zP9K*&awALCN{FXr1Gb zIhmJXnk`hYlk0c20~?`< zL)A=bCzFMBoMGspoqWO4UlAR%^G)A1i+11}%E?M{f$_VAh+i@wHzDWBg;GYg%#t}W zm+ZbST*weDV~^%dD3J)IV(W5txkNlx$pCygl{;h*YhGE|m!+OtMYE{s#X2+@o*PGp_ z+F$1ez0o47wslN9y!k}!lPcfHH;l5sG9zoG8R$MwCzVa`%|Lcf#%YNYWi>0R?eqo} zP~XxY2GQ_t>h+*^<8-~7(7jkyJE3ZO{#HVp^!%we9_QIR_QY==v(cBJM3AA+)c#L` znz`A;t)9-)h6&<~4Xys4&QJD~^57}A@SQ$G{-Mmw8&1r@iG^9tt$pIhmsS3&tj9gM ZFK7+&yFp@F_@d$rJ&#gsK7)JFzXATx1_%HE delta 2541 zcmbuA3wTu35yyXX_U_)@n;Tp~gBU=FD7q4&i4tniLJ%;NhlL;piwc;QL@-Dft5)4s zqoPOHet^YGF&$_H>D3pcbskGMR zIZZZr&rJ2EhIl;bGPq%EBu{#tN}114hWVVvXrED*{G2g9r405NM>@FK=~*_MpSe8m zvyK-8_w>ps>6)2EKBq9m+Po+nP(A6wNd>dgRnrQ}tEN}Z^chRJ5F1ldGriYw*66Q3 ze`EcP(L*9H@p6zG?a}KMUe&~WUgLGaOzh$FD~1WuLoEJleg4irg0rLf$yeCm^9HZG zyy^26ZwI$WyH6d*J2vb_pLa>SZ1Q=J_kBL#L!W=L*=LI-|6;StzkUA0M?PEm*yX=I z+xWz1JD&=j!nCVu3d%+gxoAq|jC57a`97cVxz87T>9d1$!^yF(rs3RpwN%qnduE_^ zKmud&QOQ^gLarEwTmcQaLWVFRlt-$aA{)vIbI29skSk8geYG9O=}O0gOb!NlPrGO6 z{wO*HSy_WKBY8mO#p+w3yD1zNsLuq>B%5>!Cih%x8vu`FRzHHQHO4YjhtXtZriF~aBX(?oMIc> zDtkqe@h18|%1@d&F?b@o|L~$N(I$%PdF(`|o+fM8RqcwB-sAC#h*MtSM9M3oZP9+r zNwL^2`yGm?AUV%%Mazwn8iQ z>7w24YW+HD^>VdBd0Lr1T9X<@Kckhnl1Hdx3G>zF7Ja4nvRrqY^}AYM@iWqeXXRMd zNI%v}37O|)5bI=wzN<5opT&Ba#;cmbOLBqoG#g|+Z^&lel&!oa+j(1du+bPcnGVVi z;scY%7ESd-)0<|K&vH}5CuTUGnk$sgW{0N#xw)SIh0Ro}gC(P>kEK$tl%OudFSXB% zoWh}@6w}-W=-Zr%qZ#(2N~NfL-LBo-uHD+EWri*S=3qk(HUX4oHm{F zU0t+I7j4r?ad7N`2kWcQ82Mq0$bei8lhw=s(Z7i-^9taqMf&CDNeBL zz#f@BEjC8~Z8T95Vi>AdE|Vz3C5y3=%?;9#K$6@fIV_Mvv?sdpj^wgYda^|hmtJy| z^p+!)rleT<$S~z2rEgey9Sf4;@UX}lUPkRHiX9n8(_!ayhALE(*~yUaPUo0p6; ziwj$kq(HeHKlX*jmZ)IDR}u?1v%+KTtWyJiV`r8+U&O__Gd|eXF(+eR)V^#l;kVXS zt-g7XvuM8#x|GZIIG5=0c5u3>!zSviTioWJ`PSizkF{w{G?Xsap)Hznrag^*I*RRe z{8U9FkqOQ@%ZThN8^8V9ziW@N_bM5Uu`lnvp#7dJ+V2u+%`=rd;Rg@@zN?H5uW}`| sdlAiqcd@lI`&YZGxO%U5yR+WaXDetK3zB-A*Pv=(lf01I_)c^nh diff --git a/Server/src/Room.java b/Server/src/Room.java index e93d3d7..7e3299c 100644 --- a/Server/src/Room.java +++ b/Server/src/Room.java @@ -48,11 +48,11 @@ public class Room { try { - for(int p = 0; p < players.length; p++) + for (int p = 0; p < players.length; p++) { - if(players[p] != null) + if (players[p] != null) { - if(System.currentTimeMillis() - players[p].lastTimeSendTimeOutCheck > 30000 && players[p].lastTimeSendTimeOutCheck != -1) + if (System.currentTimeMillis() - players[p].lastTimeSendTimeOutCheck > 30000 && players[p].lastTimeSendTimeOutCheck != -1) { server.deleteRoom(roomCode); } @@ -60,13 +60,12 @@ public class Room players[p].output.write(new byte[]{126, 0, 0, 0, 0, 0, 0, 0, 0, 0}); } } - } - catch(Exception e) + } catch (Exception e) { } - if(System.currentTimeMillis() - timeOut > 600000) + if (System.currentTimeMillis() - timeOut > 600000) { System.out.println("[" + Server.getDateTime() + "] Room " + roomCode + " closed due to timeout!"); server.deleteRoom(roomCode); @@ -75,7 +74,9 @@ public class Room }; t.scheduleAtFixedRate(tt, 0, 10000); - }catch(Exception e){} + } catch (Exception e) + { + } } public void addClient(Client client) @@ -156,9 +157,6 @@ public class Room players[i].output.write(new byte[]{2, (byte) currentPlayer, 0, 0, 0, 0, 0, 0, 0, 0}); } break; - case 0: - server.deleteRoom(roomCode); - break; case 126: players[player].lastTimeSendTimeOutCheck = System.currentTimeMillis(); break; @@ -171,6 +169,7 @@ public class Room } } }); + t.setName("Thread Player: " + (playerCount - 1)); t.start(); threads.add(t); break; @@ -197,9 +196,9 @@ public class Room byte[] name = players[k].name.substring(0, 8).getBytes(StandardCharsets.US_ASCII); byte[] send = new byte[10]; send[0] = 5; - send[1] = (byte)k; + send[1] = (byte) k; - for(int i = 2; i < send.length; i++) + for (int i = 2; i < send.length; i++) { send[i] = name[i - 2]; } @@ -217,9 +216,9 @@ public class Room byte[] name = players[k].name.substring(0, 8).getBytes(StandardCharsets.US_ASCII); byte[] send = new byte[10]; send[0] = 5; - send[1] = (byte)k; + send[1] = (byte) k; - for(int i = 2; i < send.length; i++) + for (int i = 2; i < send.length; i++) { send[i] = name[i - 2]; } @@ -253,7 +252,7 @@ public class Room try { - if(players[0] != null) + if (players[0] != null) { players[0].output.write(new byte[]{127, 0, 0, 0, 0, 0, 0, 0, 0, 0}); } @@ -264,7 +263,7 @@ public class Room try { - if(players[1] != null) + if (players[1] != null) { players[1].output.write(new byte[]{127, 0, 0, 0, 0, 0, 0, 0, 0, 0}); } @@ -275,7 +274,7 @@ public class Room try { - if(players[2] != null) + if (players[2] != null) { players[2].output.write(new byte[]{127, 0, 0, 0, 0, 0, 0, 0, 0, 0}); } @@ -286,7 +285,7 @@ public class Room try { - if(players[3] != null) + if (players[3] != null) { players[3].output.write(new byte[]{127, 0, 0, 0, 0, 0, 0, 0, 0, 0}); } @@ -295,9 +294,22 @@ public class Room { } - for(int i = 0; i < threads.size(); i++) + + for (int i = 0; i < threads.size(); i++) + { + try + { + threads.get(i).interrupt(); + } catch (Exception e) + { + } + } + + try + { + t.cancel(); + } catch (Exception e) { - threads.get(i).interrupt(); } } }