Revert "OBT1.1.0 Merge branch 'dev_pte' into dev"
This reverts commit177cf89756, reversing changes made to42ba733cd4.
This commit is contained in:
@@ -126,7 +126,7 @@ namespace Barotrauma.Networking
|
||||
if (!MathUtils.NearlyEqual(karma, syncedKarma, 10.0f))
|
||||
{
|
||||
syncedKarma = karma;
|
||||
GameMain.NetworkMember.IncrementLastClientListUpdateID();
|
||||
GameMain.NetworkMember.LastClientListUpdateID++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -174,7 +174,7 @@ namespace Barotrauma.Networking
|
||||
StartTime = DateTime.Now;
|
||||
|
||||
OnStarted(transfer);
|
||||
GameMain.Server.IncrementLastClientListUpdateID();
|
||||
GameMain.Server.LastClientListUpdateID++;
|
||||
|
||||
return transfer;
|
||||
}
|
||||
@@ -204,7 +204,7 @@ namespace Barotrauma.Networking
|
||||
|
||||
if (numRemoved > 0 || endedTransfers.Count > 0)
|
||||
{
|
||||
GameMain.Server.IncrementLastClientListUpdateID();
|
||||
GameMain.Server.LastClientListUpdateID++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -327,7 +327,7 @@ namespace Barotrauma.Networking
|
||||
}
|
||||
}
|
||||
|
||||
IncrementLastClientListUpdateID();
|
||||
LastClientListUpdateID++;
|
||||
|
||||
if (newClient.Connection == OwnerConnection && OwnerConnection != null)
|
||||
{
|
||||
@@ -3222,7 +3222,7 @@ namespace Barotrauma.Networking
|
||||
initiatedStartGame = false;
|
||||
GameMain.ResetFrameTime();
|
||||
|
||||
IncrementLastClientListUpdateID();
|
||||
LastClientListUpdateID++;
|
||||
|
||||
roundStartTime = DateTime.Now;
|
||||
|
||||
@@ -3532,7 +3532,7 @@ namespace Barotrauma.Networking
|
||||
{
|
||||
var coolDownRemaining = Client.NameChangeCoolDown - timeSinceNameChange;
|
||||
SendDirectChatMessage($"ServerMessage.NameChangeFailedCooldownActive~[seconds]={(int)coolDownRemaining.TotalSeconds}", c);
|
||||
IncrementLastClientListUpdateID();
|
||||
LastClientListUpdateID++;
|
||||
//increment the ID to make sure the current server-side name is treated as the "latest",
|
||||
//and the client correctly reverts back to the old name
|
||||
c.NameId++;
|
||||
@@ -3545,7 +3545,7 @@ namespace Barotrauma.Networking
|
||||
|
||||
if (result != null)
|
||||
{
|
||||
IncrementLastClientListUpdateID();
|
||||
LastClientListUpdateID++;
|
||||
return result.Value;
|
||||
}
|
||||
|
||||
@@ -3562,14 +3562,14 @@ namespace Barotrauma.Networking
|
||||
c.Name = newName;
|
||||
c.RejectedName = string.Empty;
|
||||
SendChatMessage($"ServerMessage.NameChangeSuccessful~[oldname]={oldName}~[newname]={newName}", ChatMessageType.Server);
|
||||
IncrementLastClientListUpdateID();
|
||||
LastClientListUpdateID++;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
//update client list even if the name cannot be changed to the one sent by the client,
|
||||
//so the client will be informed what their actual name is
|
||||
IncrementLastClientListUpdateID();
|
||||
LastClientListUpdateID++;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -4857,7 +4857,7 @@ namespace Barotrauma.Networking
|
||||
private void UpdateClientLobbies()
|
||||
{
|
||||
// Triggers a call to WriteClientList(), which causes clients to call GameClient.ReadClientList()
|
||||
IncrementLastClientListUpdateID();
|
||||
LastClientListUpdateID++;
|
||||
}
|
||||
|
||||
private List<Client> GetPlayingClients()
|
||||
|
||||
@@ -163,7 +163,7 @@ namespace Barotrauma
|
||||
{
|
||||
client.Character.CharacterHealth.ApplyAffliction(null, new Affliction(herpesAffliction, herpesStrength));
|
||||
GameServer.Log($"{GameServer.ClientLogName(client)} has contracted space herpes due to low karma.", ServerLog.MessageType.Karma);
|
||||
GameMain.NetworkMember.IncrementLastClientListUpdateID();
|
||||
GameMain.NetworkMember.LastClientListUpdateID++;
|
||||
}
|
||||
else if (existingAffliction != null)
|
||||
{
|
||||
|
||||
@@ -279,7 +279,7 @@ namespace Barotrauma.Networking
|
||||
var shuttleGaps = Gap.GapList.FindAll(g => RespawnShuttles.Contains(g.Submarine) && g.ConnectedWall != null);
|
||||
shuttleGaps.ForEach(g => Spawner.AddEntityToRemoveQueue(g));
|
||||
|
||||
var dockingPorts = Item.ItemList.Where(i => RespawnShuttles.Contains(i.Submarine) && i.GetComponent<DockingPort>() != null).ToList();
|
||||
var dockingPorts = Item.ItemList.FindAll(i => RespawnShuttles.Contains(i.Submarine) && i.GetComponent<DockingPort>() != null);
|
||||
dockingPorts.ForEach(d => d.GetComponent<DockingPort>().Undock());
|
||||
|
||||
if (!IsShuttleInsideLevel || DateTime.Now > teamSpecificState.DespawnTime)
|
||||
|
||||
Reference in New Issue
Block a user