space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor gamestatemanager stuff (#3709)

Browse Source
This commit is contained in:
metalgearsloth
2023-01-24 11:04:37 +11:00
committed by GitHub
parent 06fba240b7
commit b562fba520
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Robust.Client/GameStates/ClientGameStateManager.cs
View File

@@ -51,7 +51,6 @@ namespace Robust.Client.GameStates
[Dependency] private readonly IPlayerManager _players = default!;
[Dependency] private readonly IClientNetManager _network = default!;
[Dependency] private readonly IBaseClient _client = default!;
[Dependency] private readonly INetworkedMapManager _mapManager = default!;
[Dependency] private readonly IClientGameTiming _timing = default!;
[Dependency] private readonly INetConfigurationManager _config = default!;
[Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
@@ -376,7 +375,7 @@ namespace Robust.Client.GameStates
public void RequestFullState(EntityUid? missingEntity = null)
{
_sawmill.Info("Requesting full server state");
_network.ClientSendMessage(new MsgStateRequestFull() { Tick = _timing.LastRealTick , MissingEntity = missingEntity ?? EntityUid.Invalid });
_network.ClientSendMessage(new MsgStateRequestFull { Tick = _timing.LastRealTick , MissingEntity = missingEntity ?? EntityUid.Invalid });
_processor.RequestFullState();
}
@@ -391,8 +390,8 @@ namespace Robust.Client.GameStates
}
var input = _entitySystemManager.GetEntitySystem<InputSystem>();
var pendingInputEnumerator = _pendingInputs.GetEnumerator();
var pendingMessagesEnumerator = _pendingSystemMessages.GetEnumerator();
using var pendingInputEnumerator = _pendingInputs.GetEnumerator();
using var pendingMessagesEnumerator = _pendingSystemMessages.GetEnumerator();
var hasPendingInput = pendingInputEnumerator.MoveNext();
var hasPendingMessage = pendingMessagesEnumerator.MoveNext();
@@ -520,7 +519,7 @@ namespace Robust.Client.GameStates
// Remove predicted component additions
foreach (var comp in toRemove)
{
_entities.RemoveComponent(comp.Owner, comp);
_entities.RemoveComponent(entity, comp);
}
// Re-add predicted removals
@@ -800,7 +799,7 @@ namespace Robust.Client.GameStates
var xformSys = _entitySystemManager.GetEntitySystem<SharedTransformSystem>();
var currentEnts = _entities.GetEntities();
var toDelete = new List<EntityUid>(Math.Max(64, currentEnts.Count() - stateEnts.Count()));
var toDelete = new List<EntityUid>(Math.Max(64, _entities.EntityCount - stateEnts.Count));
foreach (var ent in currentEnts)
{
if (ent.IsClientSide())
@@ -1106,7 +1105,7 @@ namespace Robust.Client.GameStates
_sawmill.Error($"Failed to apply comp state: entity={comp.Owner}, comp={comp.GetType()}");
_runtimeLog.LogException(e, $"{nameof(ClientGameStateManager)}.{nameof(HandleEntityState)}");
#else
_sawmill.Error($"Failed to apply comp state: entity={comp.Owner}, comp={comp.GetType()}");
_sawmill.Error($"Failed to apply comp state: entity={uid}, comp={comp.GetType()}");
throw;
#endif
}

5
Robust.Server/GameStates/ServerGameStateManager.cs
View File

@@ -71,7 +71,7 @@ namespace Robust.Server.GameStates
_networkManager.Connected += HandleClientConnected;
_networkManager.Disconnect += HandleClientDisconnect;
_pvs = EntitySystem.Get<PVSSystem>();
_pvs = _entityManager.System<PVSSystem>();
_parallelMgr.AddAndInvokeParallelCountChanged(ResetParallelism);
@@ -176,9 +176,6 @@ namespace Robust.Server.GameStates
var oldestAckValue = GameTick.MaxValue.Value;
var mainThread = Thread.CurrentThread;
var parentDeps = IoCManager.Instance!;
_pvs.ProcessCollections();
// people not in the game don't get states