From 5e7f229e826c2848847191e25f732cd25d6107a1 Mon Sep 17 00:00:00 2001 From: Mister_Nebula <41904486+misternebula@users.noreply.github.com> Date: Sun, 9 Aug 2020 11:02:59 +0100 Subject: [PATCH 1/4] Update SectorSync.cs --- QSB/TransformSync/SectorSync.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/QSB/TransformSync/SectorSync.cs b/QSB/TransformSync/SectorSync.cs index ba59f770..f2b62cb7 100644 --- a/QSB/TransformSync/SectorSync.cs +++ b/QSB/TransformSync/SectorSync.cs @@ -64,17 +64,21 @@ namespace QSB.TransformSync private void OnClientReceiveMessage(SectorMessage message) { - DebugLog.ToScreen($"Received sector {message.SectorName} for id {message.SenderId}"); - var sector = FindSectorByName((Sector.Name)message.SectorId, message.SectorName); + if (_allSectors == null || _allSectors.Count == 0) + { + DebugLog.ToConsole($"Error: _allSectors is null or empty for player {message.SenderId}!", OWML.Common.MessageType.Error); + } + if (sector == null) { - DebugLog.ToScreen($"Sector {message.SectorName} not found"); + DebugLog.ToScreen($"Sector {message.SectorName},{(Sector.Name)message.SectorId} not found!"); return; } - DebugLog.ToScreen($"Found sector {message.SectorName} for {message.SenderId}"); + var transformSync = PlayerRegistry.GetTransformSync(message.SenderId); + DebugLog.ToScreen($"{transformSync.GetType().Name} of ID {message.SenderId} set to {message.SectorName}"); PlayerRegistry.GetTransformSync(message.SenderId).ReferenceTransform = sector.transform; } From 1800c21b0b6c9ff724939e45e97732b6c348aa3f Mon Sep 17 00:00:00 2001 From: Mister_Nebula <41904486+misternebula@users.noreply.github.com> Date: Sun, 9 Aug 2020 11:04:50 +0100 Subject: [PATCH 2/4] Update SectorSync.cs --- QSB/TransformSync/SectorSync.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/QSB/TransformSync/SectorSync.cs b/QSB/TransformSync/SectorSync.cs index f2b62cb7..c23dc203 100644 --- a/QSB/TransformSync/SectorSync.cs +++ b/QSB/TransformSync/SectorSync.cs @@ -56,7 +56,7 @@ namespace QSB.TransformSync private Sector FindSectorByName(Sector.Name sectorName, string goName) { - return _allSectors? + return _allSectors .FirstOrDefault(sector => sector != null && sector.GetName() == sectorName && sector.name == goName); @@ -66,7 +66,7 @@ namespace QSB.TransformSync { var sector = FindSectorByName((Sector.Name)message.SectorId, message.SectorName); - if (_allSectors == null || _allSectors.Count == 0) + if (_allSectors.Count == 0) { DebugLog.ToConsole($"Error: _allSectors is null or empty for player {message.SenderId}!", OWML.Common.MessageType.Error); } @@ -79,7 +79,7 @@ namespace QSB.TransformSync var transformSync = PlayerRegistry.GetTransformSync(message.SenderId); DebugLog.ToScreen($"{transformSync.GetType().Name} of ID {message.SenderId} set to {message.SectorName}"); - PlayerRegistry.GetTransformSync(message.SenderId).ReferenceTransform = sector.transform; + transformSync.ReferenceTransform = sector.transform; } private void OnServerReceiveMessage(SectorMessage message) @@ -116,7 +116,7 @@ namespace QSB.TransformSync private Sector GetClosestSector(Transform trans) { - return _allSectors? + return _allSectors .Where(sector => sector != null && !_sectorBlacklist.Contains(sector.GetName())) .OrderBy(sector => Vector3.Distance(sector.transform.position, trans.position)) From b153262572474e7d2f6bced6dc22c1358f9d731e Mon Sep 17 00:00:00 2001 From: Mister_Nebula <41904486+misternebula@users.noreply.github.com> Date: Sun, 9 Aug 2020 11:05:25 +0100 Subject: [PATCH 3/4] Update SectorSync.cs --- QSB/TransformSync/SectorSync.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QSB/TransformSync/SectorSync.cs b/QSB/TransformSync/SectorSync.cs index c23dc203..6e1736bb 100644 --- a/QSB/TransformSync/SectorSync.cs +++ b/QSB/TransformSync/SectorSync.cs @@ -68,7 +68,7 @@ namespace QSB.TransformSync if (_allSectors.Count == 0) { - DebugLog.ToConsole($"Error: _allSectors is null or empty for player {message.SenderId}!", OWML.Common.MessageType.Error); + DebugLog.ToConsole($"Error: _allSectors is empty for player {message.SenderId}!", OWML.Common.MessageType.Error); } if (sector == null) From ec0853bcd77747bc57d4bb7a97f345efce41f281 Mon Sep 17 00:00:00 2001 From: Mister_Nebula <41904486+misternebula@users.noreply.github.com> Date: Sun, 9 Aug 2020 11:06:51 +0100 Subject: [PATCH 4/4] Update SectorSync.cs --- QSB/TransformSync/SectorSync.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QSB/TransformSync/SectorSync.cs b/QSB/TransformSync/SectorSync.cs index 6e1736bb..0a17f46e 100644 --- a/QSB/TransformSync/SectorSync.cs +++ b/QSB/TransformSync/SectorSync.cs @@ -68,7 +68,7 @@ namespace QSB.TransformSync if (_allSectors.Count == 0) { - DebugLog.ToConsole($"Error: _allSectors is empty for player {message.SenderId}!", OWML.Common.MessageType.Error); + DebugLog.ToConsole("Error: _allSectors is empty!", OWML.Common.MessageType.Error); } if (sector == null)