Merge pull request #6686 from samme/fix/container-destroy-child

Fix removing destroyed Container children
phaserjs · Jan 12, 2024 · e91551b · e91551b
2 parents 8cae5a3 + 5cd5cad
commit e91551b
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/src/gameobjects/container/Container.js b/src/gameobjects/container/Container.js
@@ -438,7 +438,7 @@ var Container = new Class({
      */
     addHandler: function (gameObject)
     {
-        gameObject.once(Events.DESTROY, this.remove, this);
+        gameObject.once(Events.DESTROY, this.onChildDestroyed, this);
 
         if (this.exclusive)
         {
@@ -976,7 +976,7 @@ var Container = new Class({
             {
                 if (list[i] && list[i].scene)
                 {
-                    list[i].off(Events.DESTROY, this.remove, this);
+                    list[i].off(Events.DESTROY, this.onChildDestroyed, this);
 
                     list[i].destroy();
                 }
@@ -1452,6 +1452,25 @@ var Container = new Class({
         this.tempTransformMatrix.destroy();
 
         this.list = [];
+    },
+
+    /**
+     * Internal handler, called when a child is destroyed.
+     *
+     * @method Phaser.GameObjects.Container#onChildDestroyed
+     * @protected
+     * @since 3.70.1
+     */
+    onChildDestroyed: function (gameObject)
+    {
+        ArrayUtils.Remove(this.list, gameObject);
+
+        if (this.exclusive)
+        {
+            gameObject.parentContainer = null;
+
+            gameObject.removedFromScene();
+        }
     }
 
 });