Merge pull request #923 from the-hideout/fix-map-crash

Fix map crash
the-hideout · Apr 12, 2024 · 0c9f226 · 0c9f226
2 parents 3df13b5 + bf83539
commit 0c9f226
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/features/maps/index.js b/src/features/maps/index.js
@@ -133,6 +133,10 @@ export const useMapImages = () => {
             if (imageData.altMaps) {
                 for (const altKey of imageData.altMaps) {
                     const altApiMap = maps.find(map => map.normalizedName === altKey);
+                    if (!altApiMap) {
+                        // alt map is missing; so we skip it
+                        continue;
+                    }
                     apiImageDataMerge(mapGroup, {
                         ...imageData,
                         key: altKey,

diff --git a/src/pages/map/index.js b/src/pages/map/index.js
@@ -1065,6 +1065,9 @@ function Map() {
                 }
                 if (obj.possibleLocations) {
                     for (const loc of obj.possibleLocations) {
+                        if (!loc.map?.id) {
+                            continue;
+                        }
                         if (loc.map.id !== mapData.id) {
                             continue;
                         }
@@ -1103,7 +1106,7 @@ function Map() {
                 }
                 if (obj.zones) {
                     for (const zone of obj.zones) {
-                        if (zone.map.id !== mapData.id) {
+                        if (!zone.map?.id || zone.map.id !== mapData.id) {
                             continue;
                         }
                         if (!positionIsInBounds(zone.position)) {