Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions engine/Sandbox.Engine/Scene/Networking/SceneNetworkSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -418,18 +418,6 @@ public override async Task SetSnapshotAsync( SnapshotMsg msg )
Time.Now = (float)msg.Time;
Game.ActiveScene.UpdateTimeFromHost( msg.Time );

foreach ( var s in msg.GameObjectSystems )
{
var type = Game.TypeLibrary.GetTypeByIdent( s.Type );
var system = Game.ActiveScene.GetSystemByType( type );

if ( system is null )
continue;

system.Id = s.Id;
system.ReadDataTable( s.TableData );
}

{
using var batchGroup = CallbackBatch.Batch();

Expand Down Expand Up @@ -457,6 +445,18 @@ public override async Task SetSnapshotAsync( SnapshotMsg msg )
}
}

foreach ( var s in msg.GameObjectSystems )
{
var type = Game.TypeLibrary.GetTypeByIdent( s.Type );
var system = Game.ActiveScene.GetSystemByType( type );

if ( system is null )
continue;

system.Id = s.Id;
system.ReadDataTable( s.TableData );
}

MountedVPKs?.Dispose();
MountedVPKs = null;

Expand Down
13 changes: 5 additions & 8 deletions engine/Sandbox.Engine/Scene/Scene/Scene.Network.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,13 @@ internal void SceneNetworkUpdate()
var connections = system.GetFilteredConnections( Connection.ChannelState.Connected );
var connectionsArray = connections as Connection[] ?? connections.ToArray();

if ( connectionsArray.Length != 0 )
{
var objects = networkedObjects.OfType<IDeltaSnapshot>();
var objects = networkedObjects.OfType<IDeltaSnapshot>();

// If we're the host, include any GameObjectSystems.
if ( Networking.IsHost )
objects = objects.Concat( systems );
// If we're the host, include any GameObjectSystems.
if ( Networking.IsHost )
objects = objects.Concat( systems );

system.DeltaSnapshots.Send( objects, connectionsArray );
}
system.DeltaSnapshots.Send( objects, connectionsArray );

system.DeltaSnapshots.Tick();
}
Expand Down