Merge pull request #260 from anatawa12/fix-apply-on-play-error-message

fix(apply-on-play): class name is not included in abort message
anatawa12 · Jul 14, 2023 · 9510d23 · 9510d23
2 parents 3626b1d + 227cb2e
commit 9510d23
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog].
 ### Removed
 
 ### Fixed
+- Name of failed ApplyOnPlayCallback is not included in error message `#260`
 
 ### Security
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog].
 ### Removed
 
 ### Fixed
+- Name of failed ApplyOnPlayCallback is not included in error message `#260`
 
 ### Security
 

diff --git a/Internal/ApplyOnPlay/Editor/ApplyOnPlayCaller.cs b/Internal/ApplyOnPlay/Editor/ApplyOnPlayCaller.cs
@@ -48,15 +48,15 @@ internal static bool ProcessAvatar(GameObject avatarGameObject, ApplyReason reas
                     if (!applyOnPlayCallback.ApplyOnPlay(avatarGameObject, reason))
                     {
                         var message = $"The {action} for {avatarGameObject} was aborted because " +
-                                      "'{applyOnPlayCallback.GetType().Name}' reported a failure.";
+                                      $"'{applyOnPlayCallback.CallbackName}' reported a failure.";
                         Debug.LogError(message);
                         return false;
                     }
                 }
                 catch (Exception ex)
                 {
                     var message = $"The {action} for {avatarGameObject} was aborted because " +
-                                  "'{applyOnPlayCallback.GetType().Name}' threw an exception.";
+                                  $"'{applyOnPlayCallback.CallbackName}' threw an exception.";
                     Debug.LogError(message);
                     Debug.LogException(ex);
                     return false;