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

Fixed OwnerClientName & OwnerClientIP not being set on respawned characters. The characters of clients who aren't in-game 30 seconds after a round starts are treated as disconnected, making it possible for the client to gain control of the character if they do manage to connect. Closes #583, #584

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-08-06 15:48:47 +03:00
parent e60ebc1930
commit a5a09aa664
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Barotrauma/BarotraumaShared/Source/Networking/GameServer.cs
View File

@@ -872,11 +872,10 @@ namespace Barotrauma.Networking
else
{
//if 30 seconds have passed since the round started and the client isn't ingame yet,
//kill the client's character
//consider the client's character disconnected (causing it to die if the client does not join soon)
if (gameStarted && c.Character != null && (DateTime.Now - roundStartTime).Seconds > 30.0f)
{
c.Character.Kill(CauseOfDeath.Disconnected);
c.Character = null;
c.Character.ClientDisconnected = true;
}
ClientWriteLobby(c);

2
Barotrauma/BarotraumaShared/Source/Networking/RespawnManager.cs
View File

@@ -519,6 +519,8 @@ namespace Barotrauma.Networking
{
#endif
clients[i].Character = character;
character.OwnerClientIP = clients[i].Connection.RemoteEndPoint.Address.ToString();
character.OwnerClientName = clients[i].Name;
GameServer.Log(string.Format("Respawning {0} ({1}) as {2}", clients[i].Name, clients[i].Connection?.RemoteEndPoint?.Address, characterInfos[i].Job.Name), ServerLog.MessageType.Spawning);
#if CLIENT