Skip to content

Fix/migration cleanup lost changes #417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattwalsh-unity merged 4 commits into from
Jan 8, 2021
Merged

Fix/migration cleanup lost changes #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
63f5ac0
fix: Add bug fixes wich where in master mlapi but didn't get migrated…
LukeStampfli Dec 18, 2020
252c853
fix: Add backk soft sync objects handling which was removed during mi…
LukeStampfli Dec 18, 2020
faeb837
refactor: moved diffed scene object cleanup code to spawn manager
mattwalsh-unity Jan 8, 2021
79be9af
Merge branch 'develop' into fix/migration-cleanup-lost-changes
mattwalsh-unity Jan 8, 2021
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
2 changes: 1 addition & 1 deletion com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ public ulong GetConfig(bool cache = true)
writer.WriteUInt16Packed(ProtocolVersion);
writer.WriteString(MLAPIConstants.MLAPI_PROTOCOL_VERSION);

if (!AllowRuntimeSceneChanges)
if (EnableSceneManagement && !AllowRuntimeSceneChanges)
{
for (int i = 0; i < RegisteredScenes.Count; i++)
{
Expand Down
2 changes: 2 additions & 0 deletions com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,8 @@ void DelayedSpawnAction(Stream continuationStream)
}
}

SpawnManager.CleanDiffedSceneObjects();

NetworkingManager.Singleton.IsConnectedClient = true;

NetworkingManager.Singleton.InvokeOnClientConnectedCallback(NetworkingManager.Singleton.LocalClientId);
Expand Down
9 changes: 6 additions & 3 deletions com.unity.multiplayer.mlapi/Runtime/Serialization/BitWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,14 @@ internal Stream GetStream()
/// <param name="value">The object to write</param>
public void WriteObjectPacked(object value)
{
if (value == null || value.GetType().IsNullable())
// Check unitys custom null checks
bool isNull = value == null || (value is UnityEngine.Object && ((UnityEngine.Object)value) == null);
Comment thread
mattwalsh-unity marked this conversation as resolved.

if (isNull || value.GetType().IsNullable())
{
WriteBool(value == null);
WriteBool(isNull);

if (value == null)
if (isNull)
{
return;
}
Expand Down
19 changes: 19 additions & 0 deletions com.unity.multiplayer.mlapi/Runtime/Spawning/SpawnManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,25 @@ internal static void DestroySceneObjects()
}
}

internal static void CleanDiffedSceneObjects()
{
// Clean up the diffed scene objects. I.E scene objects that have been destroyed
if (pendingSoftSyncObjects.Count > 0)
{
List<NetworkedObject> objectsToDestroy = new List<NetworkedObject>();

foreach (KeyValuePair<ulong, NetworkedObject> pair in pendingSoftSyncObjects)
{
objectsToDestroy.Add(pair.Value);
}

for (int i = 0; i < objectsToDestroy.Count; i++)
{
MonoBehaviour.Destroy(objectsToDestroy[i].gameObject);
}
}
}

internal static void ServerSpawnSceneObjectsOnStartSweep()
{
NetworkedObject[] networkedObjects = MonoBehaviour.FindObjectsOfType<NetworkedObject>();
Expand Down