fix: [#453] Add defense to object layer paths (#454)

Closes #453
excaliburjs · Aug 10, 2023 · 39f8ffa · 39f8ffa
1 parent bd019c6
commit 39f8ffa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/tiled-map-parser.ts b/src/tiled-map-parser.ts
@@ -56,7 +56,7 @@ export class TiledMap {
    }
 
    public getObjects(): TiledObjectGroup[] {
-      return this.objectGroups.filter(l => !l.getProperty('excalibur-exclude')?.value);
+      return this.objectGroups.filter(l => !l.getProperty('excalibur-exclude')?.value) ?? [];
    }
 
    public getObjectLayerByName(name: string): TiledObjectGroup {
@@ -122,13 +122,16 @@ export class TiledMap {
      let objectlayers = Array.isArray(rawMap.objectgroup) ? rawMap.objectgroup : [rawMap.objectgroup];
      for (let objectlayer of objectlayers) {
          objectlayer.type = objectlayer.type ?? 'objectgroup';
-         objectlayer.objects = Array.isArray(objectlayer.object) ? objectlayer.object : [objectlayer.object];
-         objectlayer.objects.forEach((o: any) => o.properties = o.properties?.property ?? []);
-         objectlayer.objects.forEach((o: any) => _convertToArray(o, 'properties'));
          objectlayer.properties = objectlayer.properties?.property ?? [];
-
          _convertToArray(objectlayer, 'properties');
-         delete objectlayer.object;
+         if (objectlayer.object) {
+            objectlayer.objects = Array.isArray(objectlayer.object) ? objectlayer.object : [objectlayer.object];
+            objectlayer.objects.forEach((o: any) => o.properties = o.properties?.property ?? []);
+            objectlayer.objects.forEach((o: any) => _convertToArray(o, 'properties'));
+            delete objectlayer.object;
+         } else { 
+            continue;
+         }
 
          for (let object of objectlayer.objects) {
             if (object.text) {

diff --git a/src/tiled-map-resource.ts b/src/tiled-map-resource.ts
@@ -201,7 +201,7 @@ export class TiledMapResource implements Loadable<TiledMap> {
 
    private _addTiledText(scene: Scene) {
       const excaliburObjectLayers = this.data?.getObjects();
-      if (excaliburObjectLayers.length > 0) {
+      if (excaliburObjectLayers && excaliburObjectLayers.length > 0) {
          for (const objectLayer of excaliburObjectLayers) {
             const textObjects = objectLayer.getText();
             for (const text of textObjects) {
@@ -245,7 +245,7 @@ export class TiledMapResource implements Loadable<TiledMap> {
 
    private _addTiledInsertedTiles(scene: Scene) {
       const excaliburObjectLayers = this.data?.getObjects();
-      if (excaliburObjectLayers.length > 0) {
+      if (excaliburObjectLayers && excaliburObjectLayers.length > 0) {
          for (const objectLayer of excaliburObjectLayers) {
             const inserted = objectLayer.getInsertedTiles();
             for (const tile of inserted) {