From b4ceb15743cdccf6e3ad761ee8baf224f6fbc3d3 Mon Sep 17 00:00:00 2001
From: minenice55 <star.elementa@gmail.com>
Date: Sun, 21 Jan 2024 00:15:06 -0500
Subject: [PATCH] fix weird edge case in toss boys autodispense

let beataction throw exceptions
---
 Assets/Scripts/Games/TossBoys/TossBoys.cs                | 9 ++++++++-
 Assets/Scripts/Util/BeatAction.cs                        | 9 ++++++++-
 ...UnitySourceGenerator.Editor.ProjectSettingsData.asset | 2 ++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Assets/Scripts/Games/TossBoys/TossBoys.cs b/Assets/Scripts/Games/TossBoys/TossBoys.cs
index 4a77582db..fe5c003a0 100644
--- a/Assets/Scripts/Games/TossBoys/TossBoys.cs
+++ b/Assets/Scripts/Games/TossBoys/TossBoys.cs
@@ -466,8 +466,15 @@ namespace HeavenStudio.Games
             if (passBallDict.TryGetValue(beat + lastLength, out var e))
             {
                 if (e.datamodel == "tossBoys/pop") return;
-                curReceiver = e["who"];
                 blurSet = e.datamodel == "tossBoys/blur";
+                if (blurSet)
+                {
+                    curReceiver = (int)WhichTossKid.None;
+                }
+                else
+                {
+                    curReceiver = e["who"];
+                }
                 currentLength = e.length;
                 nextIsSpecial = IsSpecialEvent(e.datamodel);
                 eventDatamodel = e.datamodel;
diff --git a/Assets/Scripts/Util/BeatAction.cs b/Assets/Scripts/Util/BeatAction.cs
index d9d75c7be..2c6ef0346 100644
--- a/Assets/Scripts/Util/BeatAction.cs
+++ b/Assets/Scripts/Util/BeatAction.cs
@@ -58,7 +58,14 @@ namespace HeavenStudio.Util
                 if (behaviour == null || !(conductor.isPlaying || conductor.isPaused))
                     return;
 
-                actions[idx].function.Invoke();
+                try
+                {
+                    actions[idx].function.Invoke();
+                }
+                catch (System.Exception e)
+                {
+                    Debug.LogError($"Exception thrown while executing BeatAction: {e}");
+                }
                 idx++;
             }
         }
diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset
index bba5cd3cb..3b88676c1 100644
--- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset
+++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset
@@ -35,5 +35,7 @@ MonoBehaviour:
   - Assets/Scripts/Games/KarateMan/KarateMan.cs
   - Assets/Scripts/Games/KarateMan/KarateManJoe.cs
   - Assets/Scripts/Games/KarateMan/KarateManNoriController.cs
+  - Assets/Scripts/Util/BeatAction.cs
+  - Assets/Scripts/Games/TossBoys/TossBoys.cs
   PathsToSkipImportEvent: []
   PathsToIgnoreOverwriteSettingOnAttribute: []