Fix null refs

bsq-ports · Jan 9, 2025 · b2540d0 · b2540d0
1 parent db2cc2d
commit b2540d0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/hooks/colorizer/Saber/SaberBurnMarkArea.cpp b/src/hooks/colorizer/Saber/SaberBurnMarkArea.cpp
@@ -35,8 +35,10 @@ void OnSaberColorChanged_SaberBurnMarkArea(int saberType,
   Sombrero::FastColor::RGBToHSV(color, h, s, _);
   Sombrero::FastColor effectColor = Sombrero::FastColor::HSVToRGB(h, s, 1);
   int intType = saberType;
-  lineRenderers[intType]->set_startColor(effectColor);
-  lineRenderers[intType]->set_endColor(effectColor);
+  if (lineRenderers[intType]) {
+    lineRenderers[intType]->set_startColor(effectColor);
+    lineRenderers[intType]->set_endColor(effectColor);
+  }
 }
 
 MAKE_HOOK_MATCH(SaberBurnMarkArea_Start, &SaberBurnMarkArea::Start, void, SaberBurnMarkArea* self) {

diff --git a/src/hooks/colorizer/Saber/SaberBurnMarkSparkles.cpp b/src/hooks/colorizer/Saber/SaberBurnMarkSparkles.cpp
@@ -33,8 +33,13 @@ void OnSaberColorChanged(int saberType, GlobalNamespace::SaberModelController* /
 
   Sombrero::FastColor::RGBToHSV(color, h, s, _);
   Sombrero::FastColor effectColor = Sombrero::FastColor::HSVToRGB(h, s, 1);
-  ParticleSystem::MainModule main = burnMarksPS[saberType]->get_main();
-  main.set_startColor(ParticleSystem::MinMaxGradient::op_Implicit___UnityEngine__ParticleSystem_MinMaxGradient(effectColor));
+  auto burnMark = burnMarksPS[saberType];
+  if (!burnMark) return;
+
+  ParticleSystem::MainModule main = burnMark->get_main();
+  if (!main.m_ParticleSystem) return;
+  main.set_startColor(
+      ParticleSystem::MinMaxGradient::op_Implicit___UnityEngine__ParticleSystem_MinMaxGradient(effectColor));
 }
 
 MAKE_HOOK_MATCH(SaberBurnMarkSparkles_Start, &SaberBurnMarkSparkles::Start, void, SaberBurnMarkSparkles* self) {