Fix a bug that might be caused by a delayed destroy

0x7c13 · Jul 30, 2023 · d1a7de0 · d1a7de0
1 parent 78e9692
commit d1a7de0
Show file tree

Hide file tree

Showing 42 changed files with 59 additions and 14 deletions.
diff --git a/Assets/Scripts/Pal3/Actor/ActorActionController.cs b/Assets/Scripts/Pal3/Actor/ActorActionController.cs
@@ -140,16 +140,19 @@ internal virtual void DeActivate()
             if (_shadow != null)
             {
                 Destroy(_shadow);
+                _shadow = null;
             }
 
             if (_rigidbody != null)
             {
                 Destroy(_rigidbody);
+                _rigidbody = null;
             }
 
             if (_collider != null)
             {
                 Destroy(_collider);
+                _collider = null;
             }
         }
 

diff --git a/Assets/Scripts/Pal3/Actor/SkeletalAnimationActorActionController.cs b/Assets/Scripts/Pal3/Actor/SkeletalAnimationActorActionController.cs
@@ -148,6 +148,7 @@ internal override void DisposeCurrentAction()
             if (_skeletalModelRenderer != null)
             {
                 _skeletalModelRenderer.Dispose();
+                _skeletalModelRenderer = null;
             }
 
             base.DisposeCurrentAction();
@@ -156,12 +157,6 @@ internal override void DisposeCurrentAction()
         internal override void DeActivate()
         {
             DisposeCurrentAction();
-
-            if (_skeletalModelRenderer != null)
-            {
-                Destroy(_skeletalModelRenderer);
-            }
-
             base.DeActivate();
         }
 

diff --git a/Assets/Scripts/Pal3/Actor/VertexAnimationActorActionController.cs b/Assets/Scripts/Pal3/Actor/VertexAnimationActorActionController.cs
@@ -221,6 +221,7 @@ internal override void DisposeCurrentAction()
             {
                 _mv3ModelRenderer.AnimationLoopPointReached -= AnimationLoopPointReached;
                 _mv3ModelRenderer.Dispose();
+                _mv3ModelRenderer = null;
             }
 
             base.DisposeCurrentAction();
@@ -229,12 +230,6 @@ internal override void DisposeCurrentAction()
         internal override void DeActivate()
         {
             DisposeCurrentAction();
-
-            if (_mv3ModelRenderer != null)
-            {
-                Destroy(_mv3ModelRenderer);
-            }
-
             base.DeActivate();
         }
 

diff --git a/Assets/Scripts/Pal3/Scene/SceneManager.cs b/Assets/Scripts/Pal3/Scene/SceneManager.cs
@@ -113,9 +113,14 @@ private void DisposeCurrentScene()
             {
                 CommandDispatcher<ICommand>.Instance.Dispatch(new SceneLeavingCurrentSceneNotification());
                 Object.Destroy(_currentScene);
-                Object.Destroy(_currentSceneRoot);
                 _currentScene = null;
             }
+
+            if (_currentSceneRoot != null)
+            {
+                Object.Destroy(_currentSceneRoot);
+                _currentSceneRoot = null;
+            }
         }
 
         public void Execute(SceneLoadCommand command)

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/AutoTriggerObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/AutoTriggerObject.cs
@@ -103,6 +103,7 @@ public override void Deactivate()
             {
                 _triggerController.OnPlayerActorEntered -= OnPlayerActorEntered;
                 Object.Destroy(_triggerController);
+                _triggerController = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/CollidableObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/CollidableObject.cs
@@ -112,11 +112,13 @@ public override void Deactivate()
                 _triggerController.OnPlayerActorEntered -= OnPlayerActorEntered;
                 _triggerController.OnPlayerActorExited -= OnPlayerActorExited;
                 Object.Destroy(_triggerController);
+                _triggerController = null;
             }
 
             if (_meshCollider != null)
             {
                 Object.Destroy(_meshCollider);
+                _meshCollider = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/Common/BoundsTriggerController.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/Common/BoundsTriggerController.cs
@@ -43,6 +43,7 @@ private void OnDisable()
             if (_collider != null)
             {
                 Destroy(_collider);
+                _collider = null;
             }
         }
 

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/Common/SceneObjectMeshCollider.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/Common/SceneObjectMeshCollider.cs
@@ -69,6 +69,7 @@ private void OnDisable()
             if (_collider != null)
             {
                 Destroy(_collider);
+                _collider = null;
             }
         }
     }

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/Common/StandingPlatformController.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/Common/StandingPlatformController.cs
@@ -80,6 +80,7 @@ private void OnDisable()
             if (_collider != null)
             {
                 Destroy(_collider);
+                _collider = null;
             }
         }
     }

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/DivineTreeFlowerObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/DivineTreeFlowerObject.cs
@@ -75,6 +75,7 @@ public override void Deactivate()
             if (_platformController != null)
             {
                 Object.Destroy(_platformController);
+                _platformController = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/DivineTreePortalObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/DivineTreePortalObject.cs
@@ -149,6 +149,7 @@ public override void Deactivate()
                 _platformController.OnPlayerActorEntered -= OnPlayerActorEntered;
                 _platformController.OnPlayerActorExited -= OnPlayerActorExited;
                 Object.Destroy(_platformController);
+                _platformController = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/ElevatorDoorObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/ElevatorDoorObject.cs
@@ -55,6 +55,7 @@ public override void Deactivate()
             if (_meshCollider != null)
             {
                 Object.Destroy(_meshCollider);
+                _meshCollider = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/ElevatorObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/ElevatorObject.cs
@@ -100,6 +100,7 @@ public override void Deactivate()
             {
                 _triggerController.OnPlayerActorEntered -= OnPlayerActorEntered;
                 Object.Destroy(_triggerController);
+                _triggerController = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/ElevatorPedalObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/ElevatorPedalObject.cs
@@ -120,6 +120,7 @@ public override void Deactivate()
             {
                 _platformController.OnPlayerActorEntered -= OnPlayerActorEntered;
                 Object.Destroy(_platformController);
+                _platformController = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/FallableObstacleObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/FallableObstacleObject.cs
@@ -89,12 +89,14 @@ public override void Deactivate()
             if (_meshCollider != null)
             {
                 Object.Destroy(_meshCollider);
+                _meshCollider = null;
             }
 
             if (_triggerController != null)
             {
                 _triggerController.OnPlayerActorEntered -= OnPlayerActorEntered;
                 Object.Destroy(_triggerController);
+                _triggerController = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/GeneralSceneObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/GeneralSceneObject.cs
@@ -80,6 +80,7 @@ public override void Deactivate()
             if (_meshCollider != null)
             {
                 Object.Destroy(_meshCollider);
+                _meshCollider = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/GravitySwitchObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/GravitySwitchObject.cs
@@ -117,6 +117,7 @@ public override void Deactivate()
             {
                 _platformController.OnPlayerActorEntered -= OnPlayerActorEntered;
                 Object.Destroy(_platformController);
+                _platformController = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/JumpableAreaObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/JumpableAreaObject.cs
@@ -56,6 +56,7 @@ public override void Deactivate()
                 _triggerController.OnPlayerActorEntered -= OnPlayerActorEntered;
                 _triggerController.OnPlayerActorExited -= OnPlayerActorExited;
                 Object.Destroy(_triggerController);
+                _triggerController = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/LiftingPlatformObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/LiftingPlatformObject.cs
@@ -168,11 +168,13 @@ public override void Deactivate()
             if (_platformController != null)
             {
                 Object.Destroy(_platformController);
+                _platformController = null;
             }
 
             if (_meshCollider != null)
             {
                 Object.Destroy(_meshCollider);
+                _meshCollider = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/MovableCarrierObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/MovableCarrierObject.cs
@@ -225,6 +225,7 @@ public override void Deactivate()
             {
                 _platformController.OnPlayerActorEntered -= OnPlayerActorEntered;
                 Object.Destroy(_platformController);
+                _platformController = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/MushroomBridgeObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/MushroomBridgeObject.cs
@@ -92,6 +92,7 @@ public override void Deactivate()
             if (_platformController != null)
             {
                 Object.Destroy(_platformController);
+                _platformController = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/PedalSwitchObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/PedalSwitchObject.cs
@@ -130,6 +130,7 @@ public override void Deactivate()
             {
                 _platformController.OnPlayerActorEntered -= OnPlayerActorEntered;
                 Object.Destroy(_platformController);
+                _platformController = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/PiranhaFlowerObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/PiranhaFlowerObject.cs
@@ -114,6 +114,7 @@ public override void Deactivate()
             {
                 _triggerController.OnPlayerActorEntered -= OnPlayerActorEntered;
                 Object.Destroy(_triggerController);
+                _triggerController = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/PushableObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/PushableObject.cs
@@ -391,6 +391,7 @@ public override void Deactivate()
             {
                 _triggerController.OnPlayerActorEntered -= OnPlayerActorEntered;
                 Object.Destroy(_triggerController);
+                _triggerController = null;
             }
 
             if (_standingPlatformController != null)

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/RareChestObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/RareChestObject.cs
@@ -75,6 +75,7 @@ public override void Deactivate()
             if (_meshCollider != null)
             {
                 Object.Destroy(_meshCollider);
+                _meshCollider = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/RetractableBlockerObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/RetractableBlockerObject.cs
@@ -57,6 +57,7 @@ public override void Deactivate()
             if (_meshCollider != null)
             {
                 Object.Destroy(_meshCollider);
+                _meshCollider = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/RoadElevatorOrBlockerObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/RoadElevatorOrBlockerObject.cs
@@ -130,11 +130,13 @@ public override void Deactivate()
             if (_platformController != null)
             {
                 Object.Destroy(_platformController);
+                _platformController = null;
             }
 
             if (_meshCollider != null)
             {
                 Object.Destroy(_meshCollider);
+                _meshCollider = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/RotatingBridgeObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/RotatingBridgeObject.cs
@@ -91,6 +91,7 @@ public override void Deactivate()
             if (_platformController != null)
             {
                 Object.Destroy(_platformController);
+                _platformController = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/RotatingWallObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/RotatingWallObject.cs
@@ -83,16 +83,19 @@ public override void Deactivate()
             if (_meshCollider != null)
             {
                 Object.Destroy(_meshCollider);
+                _meshCollider = null;
             }
 
             if (_subObjectMeshCollider != null)
             {
                 Object.Destroy(_subObjectMeshCollider);
+                _subObjectMeshCollider = null;
             }
 
             if (_subObjectGameObject != null)
             {
                 Object.Destroy(_subObjectGameObject);
+                _subObjectGameObject = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/SceneObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/SceneObject.cs
@@ -281,6 +281,7 @@ public virtual void Deactivate()
             if (_sceneObjectGameObject != null)
             {
                 Object.Destroy(_sceneObjectGameObject);
+                _sceneObjectGameObject = null;
             }
         }
 

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/SectorBridgeObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/SectorBridgeObject.cs
@@ -66,6 +66,7 @@ public override void Deactivate()
             if (_standingPlatformController != null)
             {
                 Object.Destroy(_standingPlatformController);
+                _standingPlatformController = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/SpecialSwitchObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/SpecialSwitchObject.cs
@@ -113,6 +113,7 @@ public override void Deactivate()
             if (_meshCollider != null)
             {
                 Object.Destroy(_meshCollider);
+                _meshCollider = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/StaticOrAnimatedObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/StaticOrAnimatedObject.cs
@@ -113,6 +113,7 @@ private void LateUpdate()
         private void OnDisable()
         {
             Destroy(_effectComponent);
+            _effectComponent = null;
         }
     }
 }
diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/SuspensionBridgeObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/SuspensionBridgeObject.cs
@@ -89,6 +89,7 @@ public override void Deactivate()
             if (_platformController != null)
             {
                 Object.Destroy(_platformController);
+                _platformController = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/SwitchObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/SwitchObject.cs
@@ -124,6 +124,8 @@ public override IEnumerator InteractAsync(InteractionContext ctx)
                 _interactionIndicatorRenderer.Dispose();
                 Object.Destroy(_interactionIndicatorRenderer);
                 Object.Destroy(_interactionIndicatorGameObject);
+                _interactionIndicatorRenderer = null;
+                _interactionIndicatorGameObject = null;
             }
 
             if (ctx.StartedByPlayer &&
@@ -204,11 +206,13 @@ public override void Deactivate()
             {
                 _interactionIndicatorRenderer.Dispose();
                 Object.Destroy(_interactionIndicatorRenderer);
+                _interactionIndicatorRenderer = null;
             }
 
             if (_interactionIndicatorGameObject != null)
             {
                 Object.Destroy(_interactionIndicatorGameObject);
+                _interactionIndicatorGameObject = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/SwordBridgeObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/SwordBridgeObject.cs
@@ -85,6 +85,7 @@ public override void Deactivate()
             if (_platformController != null)
             {
                 Object.Destroy(_platformController);
+                _platformController = null;
             }
 
             base.Deactivate();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/ThreePhaseBridgeObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/ThreePhaseBridgeObject.cs
@@ -104,6 +104,7 @@ public override void Deactivate()
             if (_standingPlatformController != null)
             {
                 Object.Destroy(_standingPlatformController);
+                _standingPlatformController = null;
             }
 
             base.Deactivate();