Merge pull request #358 from anatawa12/apply-on-play-enter-playmode

fix: incompatible with Reload Scene disabled
anatawa12 · Aug 21, 2023 · 25b147e · 25b147e
2 parents 30f6486 + 569b75c
commit 25b147e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md
@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog].
 
 ### Fixed
 - ClearEndpointPosition is not applied for non-first PhysBones on the GameObject `#357`
+- Incompatbile with Reload Scene disabaled `#358`
 
 ### Security
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog].
 
 ### Fixed
 - ClearEndpointPosition is not applied for non-first PhysBones on the GameObject `#357`
+- Incompatbile with Reload Scene disabaled `#358`
 
 ### Security
 

diff --git a/Internal/ApplyOnPlay/Runtime/GlobalActivator.cs b/Internal/ApplyOnPlay/Runtime/GlobalActivator.cs
@@ -23,6 +23,14 @@ private void Awake()
         {
             if (!EditorApplication.isPlaying || this == null) return;
             activate?.Invoke(this);
+            DestroyImmediate(this);
+        }
+
+        private void Start()
+        {
+            if (!EditorApplication.isPlaying || this == null) return;
+            activate?.Invoke(this);
+            DestroyImmediate(this);
         }
 
         internal static bool HasAvatarInScene(Scene scene)