1 files changed, 6 insertions, 3 deletions

@@ -241,8 +241,11 @@ struct APState {
       pilgrimage_allows_paintings =
           slot_data.contains("pilgrimage_allows_paintings") &&
           slot_data["pilgrimage_allows_paintings"].get<int>() == 1;
-      sunwarp_access = slot_data["sunwarp_access"].get<SunwarpAccess>();
-      sunwarp_shuffle = slot_data["shuffle_sunwarps"].get<int>() == 1;
+      sunwarp_access = slot_data.contains("sunwarp_access")
+                           ? slot_data["sunwarp_access"].get<SunwarpAccess>()
+                           : kSUNWARP_ACCESS_NORMAL;
+      sunwarp_shuffle = slot_data.contains("shuffle_sunwarps") &&
+                        slot_data["shuffle_sunwarps"].get<int>() == 1;
 
       if (painting_shuffle && slot_data.contains("painting_entrance_to_exit")) {
         painting_mapping.clear();
@@ -380,7 +383,7 @@ struct APState {
       } else {
         data_storage.erase(key);
       }
-      
+
       TrackerLog("Data storage " + key + " retrieved as null");
     }
   }