Possible to use the same sub as the main submarine and the respawn shuttle, fixed duplicate client names in netlobby if reconnecting before the server has disconnected the client, fixed "end round" button not appearing when joining mid-round

This commit is contained in:
Regalis
2016-08-14 20:13:40 +03:00
parent 3f804acd42
commit 7e14ca6186
3 changed files with 10 additions and 22 deletions

View File

@@ -457,6 +457,7 @@ namespace Barotrauma.Networking
{
//AssignJobs();
GameMain.NetLobbyScreen.RemovePlayer(sender.name);
GameMain.NetLobbyScreen.AddPlayer(sender.name);
// Notify the client that they have logged in
@@ -1301,6 +1302,8 @@ namespace Barotrauma.Networking
client.Character.Kill(CauseOfDeath.Disconnected, true);
}
client.Character = null;
client.inGame = false;
if (string.IsNullOrWhiteSpace(msg)) msg = client.name + " has left the server";
if (string.IsNullOrWhiteSpace(targetmsg)) targetmsg = "You have left the server";