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

Team IDs start from 1 (-> monsters don't count as members of the team 0)

Browse Source
This commit is contained in:
Regalis
2016-09-27 17:55:45 +03:00
parent 8f0d16b145
commit 4e9ea758cb
2 changed files with 19 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Subsurface/Source/Networking/GameServer.cs
View File

@@ -906,10 +906,10 @@ namespace Barotrauma.Networking
if (AllowRespawn) respawnManager = new RespawnManager(this, selectedShuttle);
for (int j = 0; j < teamCount; j++)
for (int j = 1; j <= teamCount; j++)
{
List<Client> teamClients = connectedClients.FindAll(c => c.TeamID == j).ToList();
if (teamClients == null) continue;
List<Client> teamClients = connectedClients.FindAll(c => c.TeamID == j);
if (!teamClients.Any()) continue;
AssignJobs(teamClients);
@@ -934,7 +934,7 @@ namespace Barotrauma.Networking
characterInfos.Add(characterInfo);
}
WayPoint[] assignedWayPoints = WayPoint.SelectCrewSpawnPoints(characterInfos, Submarine.MainSubs[j]);
WayPoint[] assignedWayPoints = WayPoint.SelectCrewSpawnPoints(characterInfos, Submarine.MainSubs[j - 1]);
for (int i = 0; i < teamClients.Count; i++)
{
@@ -947,8 +947,8 @@ namespace Barotrauma.Networking
teamClients[i].Character.TeamID = teamClients[i].TeamID;
}
//host plays in team 0
if (characterInfo != null && j == 0)
//host plays in team 1
if (characterInfo != null && j == 1)
{
myCharacter = Character.Create(characterInfo, assignedWayPoints[assignedWayPoints.Length - 1].WorldPosition, false, false);
Character.Controlled = myCharacter;