Fix various bugs related to Spinner Breaking Balls carried to other s…

…creens
maddie480 · Sep 11, 2024 · c9557b4 · c9557b4
1 parent 9e48b83
commit c9557b4
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/Entities/SpinnerBreakingBallGeneric.cs b/Entities/SpinnerBreakingBallGeneric.cs
@@ -61,6 +61,12 @@ private void onTransitionOut() {
             // wipe the spinner connections so that they are computed again after the transition (in the new room).
             spinnerNeighbors = null;
             listOfSpinners = null;
+            shatteredSpinners.Clear();
+
+            // stop the running computation of spinner connections (if any)
+            computeSpinnerNeighborsToken?.Cancel();
+            computeSpinnerNeighbors = null;
+            computeSpinnerNeighborsToken = null;
         }
 
         public override void Awake(Scene scene) {
@@ -110,11 +116,11 @@ public override void Update() {
 
         public override void Removed(Scene scene) {
             base.Removed(scene);
-            computeSpinnerNeighborsToken.Cancel();
+            computeSpinnerNeighborsToken?.Cancel();
         }
         public override void SceneEnd(Scene scene) {
             base.SceneEnd(scene);
-            computeSpinnerNeighborsToken.Cancel();
+            computeSpinnerNeighborsToken?.Cancel();
         }
 
         private Task computeSpinnerConnections(CancellationToken cancelToken) {