Merge pull request #144 from Raicuparta/dev

Master <- Dev
qsb-dev · Aug 9, 2020 · 0e645cd · 0e645cd
2 parents 535f89c + dc39c2a
commit 0e645cd
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 20 deletions.
diff --git a/QSB/Events/EventHandler.cs b/QSB/Events/EventHandler.cs
@@ -45,7 +45,6 @@ private void OnServerReceiveMessage(EventMessage message)
         private void OnClientReceiveMessage(EventMessage message)
         {
             var player = PlayerRegistry.GetPlayer(message.SenderId);
-            player.IsReady = true;
             if (message.SenderId == PlayerRegistry.LocalPlayer.NetId)
             {
                 return;

diff --git a/QSB/Events/PlayerJoin.cs b/QSB/Events/PlayerJoin.cs
@@ -48,7 +48,6 @@ private void OnClientReceiveMessage(JoinMessage message)
         {
             var player = PlayerRegistry.CreatePlayer(message.SenderId);
             player.Name = message.PlayerName;
-            player.IsReady = true;
             DebugLog.ToAll(message.PlayerName, "joined!");
         }
     }

diff --git a/QSB/PlayerInfo.cs b/QSB/PlayerInfo.cs
@@ -17,7 +17,7 @@ public class PlayerInfo
         public QSBTool Translator => GetToolByType(ToolType.Translator);
         public QSBTool ProbeLauncher => GetToolByType(ToolType.ProbeLauncher);
         public string Name { get; set; }
-        public bool IsReady { get; set; }
+        public bool IsReady => Body != null;
         public State State { get; private set; }
 
         public PlayerInfo(uint id)

diff --git a/QSB/Tools/PlayerToolsManager.cs b/QSB/Tools/PlayerToolsManager.cs
@@ -124,7 +124,7 @@ private static void CreateTranslator()
             tool.ArrivalDegrees = 5f;
             tool.Type = ToolType.Translator;
             tool.ToolGameObject = group.gameObject;
-            oldTranslator.enabled = false;
+            Object.Destroy(oldTranslator);
 
             GetRenderer(translatorRoot, "Props_HEA_Translator_Geo").material = _playerToolsMaterial;
             GetRenderer(translatorRoot, "Props_HEA_Translator_RotatingPart").material = _playerToolsMaterial;

diff --git a/QSB/TransformSync/SectorSync.cs b/QSB/TransformSync/SectorSync.cs
@@ -1,14 +1,14 @@
-using QSB.Messaging;
+using System.Collections.Generic;
+using QSB.Messaging;
 using UnityEngine;
 using System.Linq;
 using QSB.Utility;
-using UnityEngine.SceneManagement;
 
 namespace QSB.TransformSync
 {
     public class SectorSync : MonoBehaviour
     {
-        private Sector[] _allSectors;
+        private readonly List<Sector> _allSectors = new List<Sector>();
         private MessageHandler<SectorMessage> _sectorHandler;
 
         private readonly Sector.Name[] _sectorBlacklist =
@@ -19,7 +19,19 @@ public class SectorSync : MonoBehaviour
 
         private void Awake()
         {
-            SceneManager.sceneLoaded += OnSceneLoaded;
+            QSB.Helper.Events.Subscribe<Sector>(OWML.Common.Events.AfterAwake);
+            QSB.Helper.Events.Event += OnEvent;
+        }
+
+        private void OnEvent(MonoBehaviour behaviour, OWML.Common.Events ev)
+        {
+            if (behaviour is Sector sector && ev == OWML.Common.Events.AfterAwake)
+            {
+                if (!_allSectors.Contains(sector))
+                {
+                    _allSectors.Add(sector);
+                }
+            }
         }
 
         private void Start()
@@ -29,11 +41,6 @@ private void Start()
             _sectorHandler.OnServerReceiveMessage += OnServerReceiveMessage;
         }
 
-        private void OnSceneLoaded(Scene scene, LoadSceneMode mode)
-        {
-            _allSectors = FindObjectsOfType<Sector>();
-        }
-
         private void SendSector(uint id, Sector sector)
         {
             DebugLog.ToScreen($"Sending sector {sector.name} for id {id}");
@@ -50,23 +57,24 @@ private void SendSector(uint id, Sector sector)
         private Sector FindSectorByName(Sector.Name sectorName, string goName)
         {
             return _allSectors?
-                .FirstOrDefault(sector => sector.GetName() == sectorName && sector.name == goName);
+                .FirstOrDefault(sector => sector != null &&
+                                          sector.GetName() == sectorName &&
+                                          sector.name == goName);
         }
 
         private void OnClientReceiveMessage(SectorMessage message)
         {
-            var sectorName = (Sector.Name)message.SectorId;
             DebugLog.ToScreen($"Received sector {message.SectorName} for id {message.SenderId}");
 
-            var sector = FindSectorByName(sectorName, message.SectorName);
+            var sector = FindSectorByName((Sector.Name)message.SectorId, message.SectorName);
 
             if (sector == null)
             {
-                DebugLog.ToScreen($"Sector {sectorName} not found");
+                DebugLog.ToScreen($"Sector {message.SectorName} not found");
                 return;
             }
 
-            DebugLog.ToScreen($"Found sector {sectorName} for {message.SenderId}");
+            DebugLog.ToScreen($"Found sector {message.SectorName} for {message.SenderId}");
             PlayerRegistry.GetTransformSync(message.SenderId).ReferenceTransform = sector.transform;
         }
 
@@ -105,7 +113,8 @@ private void UpdateTransformSync(TransformSync transformSync)
         private Sector GetClosestSector(Transform trans)
         {
             return _allSectors?
-                .Where(sector => !_sectorBlacklist.Contains(sector.GetName()))
+                .Where(sector => sector != null &&
+                                 !_sectorBlacklist.Contains(sector.GetName()))
                 .OrderBy(sector => Vector3.Distance(sector.transform.position, trans.position))
                 .First();
         }

diff --git a/QSB/manifest.json b/QSB/manifest.json
@@ -4,6 +4,6 @@
   "name": "Quantum Space Buddies",
   "description": "Adds online multiplayer to the game.",
   "uniqueName": "Raicuparta.QuantumSpaceBuddies",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "owmlVersion": "0.7.2"
 }