Fix Multiplayer

affederaffe · Sep 25, 2021 · 0e14ee0 · 0e14ee0
1 parent fdcd2a6
commit 0e14ee0
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 48 deletions.
diff --git a/Plugin/CustomFloorPlugin/AssetLoader.cs b/Plugin/CustomFloorPlugin/AssetLoader.cs
@@ -206,15 +206,13 @@ public void Construct(IBeatmapObjectCallbackController beatmapObjectCallbackCont
             public void PlatformEnabled(DiContainer container)
             {
                 container.Inject(this);
-
+                gameObject.SetActive(false);
                 List<ILightWithId>?[] lights = _lightWithIdManager.GetField<List<ILightWithId>?[], LightWithIdManager>("_lights");
-
                 if (_lightSwitchEventEffects is null)
                 {
                     Color normalColor = new(1f, 1f, 1f, 0.7490196f);
                     Color boostColor = new(1f, 1f, 1f, 0.8f);
                     Color highlightColor = new(1f, 1f, 1f, 1f);
-
                     _lightSwitchEventEffects = new LightSwitchEventEffect[5];
                     for (int i = 0; i < _lightSwitchEventEffects.Length; i++)
                     {
@@ -238,11 +236,9 @@ public void PlatformEnabled(DiContainer container)
                     foreach (LightSwitchEventEffect lse in _lightSwitchEventEffects)
                     {
                         lights[lse.lightsId] ??= new List<ILightWithId>();
-                        lse.SetField("_initialized", false);
                         lse.SetField("_beatmapObjectCallbackController", _beatmapObjectCallbackController);
                         lse.SetField("_lightManager", _lightWithIdManager);
                         lse.SetColor(Color.clear);
-                        gameObject.SetActive(true);
                         lse.Start();
                     }
                 }
@@ -255,13 +251,14 @@ public void PlatformEnabled(DiContainer container)
                 _simpleLightColor1Boost.SetColor(_colorScheme.environmentColor1Boost);
                 _simpleHighlightColor0Boost.SetColor(_colorScheme.environmentColor0Boost);
                 _simpleHighlightColor1Boost.SetColor(_colorScheme.environmentColor1Boost);
+                gameObject.SetActive(true);
             }
 
             public void PlatformDisabled()
             {
                 if (_lightSwitchEventEffects is null) return;
                 foreach (LightSwitchEventEffect lse in _lightSwitchEventEffects)
-                    lse.OnDestroy();
+                    _beatmapObjectCallbackController.beatmapEventDidTriggerEvent -= lse.HandleBeatmapObjectCallbackControllerBeatmapEventDidTrigger;
                 gameObject.SetActive(false);
             }
 

diff --git a/Plugin/CustomFloorPlugin/PlatformManager.cs b/Plugin/CustomFloorPlugin/PlatformManager.cs
@@ -83,11 +83,7 @@ public PlatformManager(SiraLog siraLog,
 
         public async void Initialize()
         {
-            try
-            {
-                await LoadPlatformsAsync();
-            }
-            catch (System.OperationCanceledException) { }
+            await LoadPlatformsAsync();
         }
 
         /// <summary>
@@ -142,10 +138,9 @@ private async Task LoadPlatformsAsync()
             }
 
             // Load all remaining platforms, or all if no cache file is found
-            foreach (string path in Directory.EnumerateFiles(DirectoryPath, "*.plat"))
+            foreach (string path in Directory.EnumerateFiles(DirectoryPath, "*.plat").Where(x => AllPlatforms.All(y => y.fullPath != x)))
             {
-                cancellationToken.ThrowIfCancellationRequested();
-                if (AllPlatforms.Any(x => x.fullPath == path)) continue;
+                if (cancellationToken.IsCancellationRequested) return;
                 CustomPlatform? platform = await CreatePlatformAsync(path);
                 if (platform is null) continue;
                 AllPlatforms.AddSorted(1, AllPlatforms.Count - 1, platform);

diff --git a/Plugin/CustomFloorPlugin/PlatformSpawner.cs b/Plugin/CustomFloorPlugin/PlatformSpawner.cs
@@ -154,44 +154,35 @@ private void OnMultiplayerGameStateModelDidChange(MultiplayerGameState multiplay
         /// <param name="platform">The <see cref="CustomPlatform"/> to change to</param>
         public async Task ChangeToPlatformAsync(CustomPlatform platform)
         {
-            try
-            {
-                if (platform == _platformManager.ActivePlatform) return;
-                _cancellationTokenSource?.Cancel();
-                _cancellationTokenSource?.Dispose();
-                _cancellationTokenSource = new CancellationTokenSource();
-                CancellationToken cancellationToken = _cancellationTokenSource.Token;
+            if (platform == _platformManager.ActivePlatform) return;
+            _cancellationTokenSource?.Cancel();
+            _cancellationTokenSource?.Dispose();
+            _cancellationTokenSource = new CancellationTokenSource();
+            CancellationToken cancellationToken = _cancellationTokenSource.Token;
 
-                DestroyCustomObjects();
-                _platformManager.ActivePlatform.gameObject.SetActive(false);
-                _platformManager.ActivePlatform = platform;
+            DestroyCustomObjects();
+            _platformManager.ActivePlatform.gameObject.SetActive(false);
+            _platformManager.ActivePlatform = platform;
 
-                if (platform.isDescriptor)
+            if (platform.isDescriptor)
+            {
+                CustomPlatform? newPlatform = await _platformManager.CreatePlatformAsync(platform.fullPath);
+                if (newPlatform is null)
                 {
-                    CustomPlatform? newPlatform = await _platformManager.CreatePlatformAsync(platform.fullPath);
-                    if (newPlatform is not null)
-                    {
-                        _platformManager.AllPlatforms.Replace(platform, newPlatform);
-                        UnityEngine.Object.Destroy(platform.gameObject);
-                    }
-
-                    cancellationToken.ThrowIfCancellationRequested();
-
-                    if (newPlatform is null)
-                    {
-                        _ = ChangeToPlatformAsync(_platformManager.DefaultPlatform);
-                        return;
-                    }
-
-                    _platformManager.ActivePlatform = newPlatform;
+                    _ = ChangeToPlatformAsync(_platformManager.DefaultPlatform);
+                    return;
                 }
-
-                _siraLog.Info($"Switching to {_platformManager.ActivePlatform.name}");
-                _environmentHider.HideObjectsForPlatform(_platformManager.ActivePlatform);
-                _platformManager.ActivePlatform.gameObject.SetActive(true);
-                SpawnCustomObjects();
+                
+                _platformManager.AllPlatforms.Replace(platform, newPlatform);
+                UnityEngine.Object.Destroy(platform.gameObject);
+                if (cancellationToken.IsCancellationRequested) return;
+                _platformManager.ActivePlatform = newPlatform;
             }
-            catch (OperationCanceledException) { }
+
+            _siraLog.Info($"Switching to {_platformManager.ActivePlatform.name}");
+            _environmentHider.HideObjectsForPlatform(_platformManager.ActivePlatform);
+            _platformManager.ActivePlatform.gameObject.SetActive(true);
+            SpawnCustomObjects();
         }
 
         /// <summary>

diff --git a/Plugin/CustomFloorPlugin/manifest.json b/Plugin/CustomFloorPlugin/manifest.json
@@ -3,7 +3,7 @@
   "id": "Custom Platforms",
   "name": "Custom Platforms",
   "author": "Rolo",
-  "version": "6.1.8",
+  "version": "6.1.9",
   "description": "A plugin to support custom platforms and environments",
   "gameVersion": "1.18.0",
   "dependsOn": {