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

Fixed characters not appearing in the round summary in mp, minor CrewManager refactoring

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-11-20 20:21:18 +02:00
parent 765587efd7
commit fce7d43ef3
13 changed files with 89 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Networking/GameServer.cs
+5 -2
View File
@@ -1189,6 +1189,9 @@ namespace Barotrauma.Networking
if (campaign != null)
{
#if CLIENT
if (GameMain.GameSession?.CrewManager != null) GameMain.GameSession.CrewManager.Reset();
#endif
GameMain.GameSession.StartRound(campaign.Map.SelectedConnection.Level, true, teamCount > 1);
}
else
@@ -1258,7 +1261,7 @@ namespace Barotrauma.Networking
teamClients[i].Character = spawnedCharacter;
#if CLIENT
GameMain.GameSession.CrewManager.characters.Add(spawnedCharacter);
GameMain.GameSession.CrewManager.AddCharacter(spawnedCharacter);
#endif
}
@@ -1271,7 +1274,7 @@ namespace Barotrauma.Networking
Character.Controlled = myCharacter;
GameMain.GameSession.CrewManager.characters.Add(myCharacter);
GameMain.GameSession.CrewManager.AddCharacter(myCharacter);
}
#endif
}
Barotrauma/BarotraumaShared/Source/Networking/RespawnManager.cs
+3 -3
View File
@@ -481,10 +481,10 @@ namespace Barotrauma.Networking
if (scooterPrefab != null && batteryPrefab != null)
{
var scooter = new Item(scooterPrefab, pos, respawnShuttle);
Entity.Spawner.CreateNetworkEvent(scooter, false);
Spawner.CreateNetworkEvent(scooter, false);
var battery = new Item(batteryPrefab, pos, respawnShuttle);
Entity.Spawner.CreateNetworkEvent(battery, false);
Spawner.CreateNetworkEvent(battery, false);
scooter.Combine(battery);
}
@@ -502,7 +502,7 @@ namespace Barotrauma.Networking
}
}
#if CLIENT
GameMain.GameSession.CrewManager.characters.Add(character);
GameMain.GameSession.CrewManager.AddCharacter(character);
#endif
}