👍 Temporary fixed a little Beat Together black screen bug

StevenKrahforst · May 21, 2024 · 8daf182 · 8daf182
1 parent 299a9cd
commit 8daf182
Showing 1 changed file with 21 additions and 22 deletions.
diff --git a/BetterBeatSaber/HudModifier/ComboHudModifier.cs b/BetterBeatSaber/HudModifier/ComboHudModifier.cs
@@ -13,16 +13,13 @@ namespace BetterBeatSaber.HudModifier;
 
 internal sealed class ComboHudModifier : IHudModifier, ITickable, IDisposable {
 
-    [UsedImplicitly]
-    [Inject]
-    private readonly ComboController _comboController = null!;
+    [InjectOptional, UsedImplicitly]
+    private readonly ComboController? _comboController;
 
-    [UsedImplicitly]
-    [Inject]
-    private readonly ComboUIController _comboUIController = null!;
+    [InjectOptional, UsedImplicitly]
+    private readonly ComboUIController? _comboUIController;
 
-    [UsedImplicitly]
-    [Inject]
+    [Inject, UsedImplicitly]
     private readonly MaterialProvider _materialProvider = null!;
 
     private CurvedTextMeshPro? _comboText;
@@ -34,21 +31,19 @@ internal sealed class ComboHudModifier : IHudModifier, ITickable, IDisposable {
     private bool _comboBroke;
 
     public void Initialize() {
+
+        if (_comboController == null || _comboUIController == null) {
+            return;
+        }
 
         var comboTexts = _comboUIController.GetComponentsInChildren<CurvedTextMeshPro>();
         if (comboTexts is not { Length: 2 })
             return;
 
         _comboText = comboTexts[0];
         _comboNumText = comboTexts[1];
-
-        if (BetterBeatSaberConfig.Instance.ComboHudModifier.Glow) {
-            _comboText.font = TextMeshProExtensions.BloomFont;
-            _comboNumText.font = TextMeshProExtensions.BloomFont;
-        }
 
         var fullComboLines = _comboUIController.GetComponentsInChildren<ImageView>();
-
         foreach (var fullComboLine in fullComboLines) {
             fullComboLine.gradient = true;
             if (BetterBeatSaberConfig.Instance.ComboHudModifier.Glow) {
@@ -58,6 +53,11 @@ public void Initialize() {
 
         _topLine = fullComboLines[0];
         _bottomLine = fullComboLines[1];
+
+        if (BetterBeatSaberConfig.Instance.ComboHudModifier.Glow) {
+            _comboText.font = TextMeshProExtensions.BloomFont;
+            _comboNumText.font = TextMeshProExtensions.BloomFont;
+        }
 
         _comboController.comboBreakingEventHappenedEvent += OnComboBreakingEventHappenedEvent;
 
@@ -88,26 +88,25 @@ public void Tick() {
     }
 
     public void Dispose() {
-        _comboController.comboBreakingEventHappenedEvent -= OnComboBreakingEventHappenedEvent;
+        if(_comboController != null)
+            _comboController.comboBreakingEventHappenedEvent -= OnComboBreakingEventHappenedEvent;
     }
 
     private void OnComboBreakingEventHappenedEvent() {
 
         _comboBroke = true;
 
-        if(_topLine != null) {
+        if(_topLine != null)
             _topLine.gameObject.SetActive(false);
-        }
 
-        if(_bottomLine != null) {
+        if(_bottomLine != null)
             _bottomLine.gameObject.SetActive(false);
-        }
 
-        if(_comboText != null) {
+        if(_comboText != null)
             _comboText.color = UnityEngine.Color.green;
-        }
 
-        _comboController.comboBreakingEventHappenedEvent -= OnComboBreakingEventHappenedEvent;
+        if(_comboController != null)
+            _comboController.comboBreakingEventHappenedEvent -= OnComboBreakingEventHappenedEvent;
 
     }