vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed exceptions during job assignment if a client or the host is controlling a character with no CharacterInfo (i.e. any non-human character)

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-08-01 21:29:55 +03:00
parent 1e11d5ab28
commit 9c039e7574
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Networking/GameServer.cs
+7 -4
View File
@@ -1876,7 +1876,10 @@ namespace Barotrauma.Networking
else //taking control of a new character else //taking control of a new character
{ {
newCharacter.ResetNetState(); newCharacter.ResetNetState();
newCharacter.LastNetworkUpdateID = client.Character.LastNetworkUpdateID; if (client.Character != null)
{
newCharacter.LastNetworkUpdateID = client.Character.LastNetworkUpdateID;
}
newCharacter.IsRemotePlayer = true; newCharacter.IsRemotePlayer = true;
newCharacter.Enabled = true; newCharacter.Enabled = true;
@@ -1936,12 +1939,12 @@ namespace Barotrauma.Networking
{ {
assignedClientCount[GameMain.NetLobbyScreen.JobPreferences[0]] = 1; assignedClientCount[GameMain.NetLobbyScreen.JobPreferences[0]] = 1;
} }
else if (myCharacter != null && !myCharacter.IsDead) else if (myCharacter?.Info?.Job != null && !myCharacter.IsDead)
{ {
assignedClientCount[myCharacter.Info.Job.Prefab] = 1; assignedClientCount[myCharacter.Info.Job.Prefab] = 1;
} }
} }
else if (myCharacter != null && !myCharacter.IsDead && myCharacter.TeamID == teamID) else if (myCharacter?.Info?.Job != null && !myCharacter.IsDead && myCharacter.TeamID == teamID)
{ {
assignedClientCount[myCharacter.Info.Job.Prefab]++; assignedClientCount[myCharacter.Info.Job.Prefab]++;
} }
@@ -1950,7 +1953,7 @@ namespace Barotrauma.Networking
foreach (Client c in connectedClients) foreach (Client c in connectedClients)
{ {
if (c.TeamID != teamID || unassigned.Contains(c)) continue; if (c.TeamID != teamID || unassigned.Contains(c)) continue;
if (c.Character != null && !c.Character.IsDead) if (c.Character?.Info?.Job != null && !c.Character.IsDead)
{ {
assignedClientCount[c.Character.Info.Job.Prefab]++; assignedClientCount[c.Character.Info.Job.Prefab]++;
} }