jonas/flufflparty-
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Server Thread Crash $2

Browse Source
This commit is contained in:
brausjonas
2023-02-01 20:41:50 +01:00
parent 4157107813
commit e0ebddd140
8 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
Generated
+1
View File
@@ -113,6 +113,7 @@
<workItem from="1675011774462" duration="1723000" />
<workItem from="1675112930043" duration="1858000" />
<workItem from="1675193746966" duration="5298000" />
<workItem from="1675280447181" duration="22000" />
</task>
<servers />
</component>
FlufflParty/UserSettings/EditorUserSettings.asset
+2 -2
View File
@@ -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
Server/.idea/workspace.xml
Generated
+1
View File
@@ -79,6 +79,7 @@
<workItem from="1675011672827" duration="777000" />
<workItem from="1675111963945" duration="610000" />
<workItem from="1675193290788" duration="3495000" />
<workItem from="1675279163903" duration="1178000" />
</task>
<servers />
</component>
Server/out/artifacts/Server_jar/Server.jar
BIN
View File
Binary file not shown.
Server/out/production/Server/Room$1.class
BIN
View File
Binary file not shown.
Server/out/production/Server/Room$2.class
BIN
View File
Binary file not shown.
Server/out/production/Server/Room.class
BIN
View File
Binary file not shown.
Server/src/Room.java
+32 -20
View File
@@ -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();
}
}
}