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

Fixed server-side crashes during job assignment if a client hasn't sent any job preferences

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-07-06 19:42:33 +03:00
parent f684f76862
commit 740d201fc3
1 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Networking/GameServer.cs
+40 -30
View File
@@ -2065,9 +2065,17 @@ namespace Barotrauma.Networking
if (jobPrefab != null) jobPreferences.Add(jobPrefab); if (jobPrefab != null) jobPreferences.Add(jobPrefab);
} }
sender.CharacterInfo = new CharacterInfo(Character.HumanConfigFile, sender.Name, gender); sender.CharacterInfo = new CharacterInfo(Character.HumanConfigFile, sender.Name, gender)
sender.CharacterInfo.HeadSpriteId = headSpriteId; {
sender.JobPreferences = jobPreferences; HeadSpriteId = headSpriteId
};
//if the client didn't provide job preferences, we'll use the preferences that are randomly assigned in the Client constructor
Debug.Assert(sender.JobPreferences.Count > 0);
if (jobPreferences.Count > 0)
{
sender.JobPreferences = jobPreferences;
}
} }
public void AssignJobs(List<Client> unassigned, bool assignHost) public void AssignJobs(List<Client> unassigned, bool assignHost)
@@ -2112,6 +2120,7 @@ namespace Barotrauma.Networking
//if any of the players has chosen a job that is Always Allowed, give them that job //if any of the players has chosen a job that is Always Allowed, give them that job
for (int i = unassigned.Count - 1; i >= 0; i--) for (int i = unassigned.Count - 1; i >= 0; i--)
{ {
if (unassigned[i].JobPreferences.Count == 0) continue;
if (!unassigned[i].JobPreferences[0].AllowAlways) continue; if (!unassigned[i].JobPreferences[0].AllowAlways) continue;
unassigned[i].AssignedJob = unassigned[i].JobPreferences[0]; unassigned[i].AssignedJob = unassigned[i].JobPreferences[0];
unassigned.RemoveAt(i); unassigned.RemoveAt(i);
@@ -2140,7 +2149,7 @@ namespace Barotrauma.Networking
} }
} }
//find a suitable job for the rest of the players //attempt to give the clients a job they have in their job preferences
foreach (Client c in unassigned) foreach (Client c in unassigned)
{ {
foreach (JobPrefab preferredJob in c.JobPreferences) foreach (JobPrefab preferredJob in c.JobPreferences)
@@ -2153,34 +2162,35 @@ namespace Barotrauma.Networking
assignedClientCount[preferredJob]++; assignedClientCount[preferredJob]++;
break; break;
} }
//none of the jobs the client prefers are available anymore }
else if (preferredJob == c.JobPreferences.Last()) }
{
//find all jobs that are still available
var remainingJobs = JobPrefab.List.FindAll(jp => assignedClientCount[preferredJob] < jp.MaxNumber && c.Karma >= jp.MinKarma);
//all jobs taken, give a random job //give random jobs to rest of the clients
if (remainingJobs.Count == 0) foreach (Client c in unassigned)
{ {
DebugConsole.ThrowError("Failed to assign a suitable job for \"" + c.Name + "\" (all jobs already have the maximum numbers of players). Assigning a random job..."); //find all jobs that are still available
int jobIndex = Rand.Range(0,JobPrefab.List.Count); var remainingJobs = JobPrefab.List.FindAll(jp => assignedClientCount[jp] < jp.MaxNumber && c.Karma >= jp.MinKarma);
int skips = 0;
while (c.Karma < JobPrefab.List[jobIndex].MinKarma) //all jobs taken, give a random job
{ if (remainingJobs.Count == 0)
jobIndex++; {
skips++; DebugConsole.ThrowError("Failed to assign a suitable job for \"" + c.Name + "\" (all jobs already have the maximum numbers of players). Assigning a random job...");
if (jobIndex >= JobPrefab.List.Count) jobIndex -= JobPrefab.List.Count; int jobIndex = Rand.Range(0, JobPrefab.List.Count);
if (skips >= JobPrefab.List.Count) break; int skips = 0;
} while (c.Karma < JobPrefab.List[jobIndex].MinKarma)
c.AssignedJob = JobPrefab.List[jobIndex]; {
assignedClientCount[c.AssignedJob]++; jobIndex++;
} skips++;
else //some jobs still left, choose one of them by random if (jobIndex >= JobPrefab.List.Count) jobIndex -= JobPrefab.List.Count;
{ if (skips >= JobPrefab.List.Count) break;
c.AssignedJob = remainingJobs[Rand.Range(0, remainingJobs.Count)];
assignedClientCount[c.AssignedJob]++;
}
} }
c.AssignedJob = JobPrefab.List[jobIndex];
assignedClientCount[c.AssignedJob]++;
}
else //some jobs still left, choose one of them by random
{
c.AssignedJob = remainingJobs[Rand.Range(0, remainingJobs.Count)];
assignedClientCount[c.AssignedJob]++;
} }
} }
} }