fix: add protect (#166)

* fix: protect * fix: merge condition
eva-engine · Dec 8, 2021 · 2ff8f94 · 2ff8f94
1 parent e7336b7
commit 2ff8f94
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/packages/eva.js/lib/core/GameObject.ts b/packages/eva.js/lib/core/GameObject.ts
@@ -233,6 +233,10 @@ class GameObject {
 
   /** Destory this gameObject */
   destroy() {
+    if (!this.transform) {
+      console.error('Cannot destroy gameObject that have already been destroyed.')
+      return
+    }
     Array.from(this.transform.children).forEach(({ gameObject }) => {
       gameObject.destroy();
     });

diff --git a/packages/eva.js/lib/core/observer.ts b/packages/eva.js/lib/core/observer.ts
@@ -130,7 +130,7 @@ function removeObjectCache(component: Component) {
  * @param {ObserverType} param0.type - observer type
  */
 function addObserver({ systemName, componentName, component, prop, type }: ObserverEvent) {
-  systemInstance[systemName].componentObserver.add({
+  systemInstance[systemName]?.componentObserver?.add({
     component,
     prop,
     type,
@@ -304,7 +304,7 @@ export function observerAdded(component: Component, componentName: string = comp
     const observerInfo = observerInfos[systemName] || {};
     const info = observerInfo[componentName];
     if (info) {
-      systemInstance[systemName].componentObserver.add({
+      systemInstance[systemName]?.componentObserver?.add({
         component,
         type: ObserverType.ADD,
         componentName,
@@ -323,7 +323,7 @@ export function observerRemoved(component: Component, componentName: string = co
     const observerInfo = observerInfos[systemName] || {};
     const info = observerInfo[componentName];
     if (info) {
-      systemInstance[systemName].componentObserver.add({
+      systemInstance[systemName]?.componentObserver?.add({
         component,
         type: ObserverType.REMOVE,
         componentName,

diff --git a/packages/plugin-renderer-img/lib/system.ts b/packages/plugin-renderer-img/lib/system.ts
@@ -60,7 +60,8 @@ export default class Img extends Renderer {
         this.imgs[changed.gameObject.id].image = instance;
       } else if (changed.type === OBSERVER_TYPE.REMOVE) {
         const sprite = this.imgs[changed.gameObject.id];
-        this.containerManager.getContainer(changed.gameObject.id).removeChild(sprite.sprite);
+        if (!sprite) return
+        this.containerManager?.getContainer(changed.gameObject.id)?.removeChild(sprite.sprite);
         sprite.sprite.destroy({ children: true });
         delete this.imgs[changed.gameObject.id];
       }

diff --git a/packages/plugin-renderer/lib/manager/ContainerManager.ts b/packages/plugin-renderer/lib/manager/ContainerManager.ts
@@ -16,7 +16,7 @@ export default class ContainerManager {
   }
   updateTransform({ name, transform }: { name: number; transform: Transform }) {
     const container = this.containerMap[name];
-    if (!container) return;
+    if (!container || !transform) return;
     const { anchor, origin, position, rotation, scale, size, skew } = transform;
     container.rotation = rotation;
     container.scale = scale as Point;

diff --git a/packages/spine-base/lib/SpineSystem.ts b/packages/spine-base/lib/SpineSystem.ts
@@ -108,7 +108,7 @@ export default class SpineSystem extends Renderer {
       return;
     }
     this.remove(changed);
-    const container = this.renderSystem.containerManager.getContainer(changed.gameObject.id);
+    const container = this.renderSystem?.containerManager?.getContainer(changed.gameObject.id);
     if (!container) {
       // console.warn('添加spine的container不存在');
       return;
@@ -164,7 +164,7 @@ export default class SpineSystem extends Renderer {
     clearTimeout(component.addHandler);
     const armature = this.armatures[changed.gameObject.id];
 
-    const container = this.renderSystem.containerManager.getContainer(changed.gameObject.id);
+    const container = this.renderSystem?.containerManager?.getContainer(changed.gameObject.id);
     if (container && armature) {
       container.removeChild(armature);
     } else {