fix(core): errors on loading empty game and trying to migrate items

WorldSellerGame · Feb 23, 2023 · b7cc657 · b7cc657
1 parent 6ab283e
commit b7cc657
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/stores/charselect/charselect.ts b/src/stores/charselect/charselect.ts
@@ -81,12 +81,12 @@ export class CharSelectState {
   @Action(UpdateAllItems)
   async updateAllItems(ctx: StateContext<ICharSelect>) {
     const state = ctx.getState();
-    const characters = state.characters.map(char => {
+    const characters = (state.characters || []).map(char => {
       if(!char) {
         return;
       }
 
-      const inventory = char.inventory.map((oldItem) => {
+      const inventory = (char.inventory || []).map((oldItem) => {
 
         // can't migrate an item with no id
         if(!oldItem.internalId) {

diff --git a/src/stores/combat/combat.ts b/src/stores/combat/combat.ts
@@ -115,7 +115,7 @@ export class CombatState {
   async updateAllItems(ctx: StateContext<IGameCombat>) {
     const state = ctx.getState();
 
-    const activeItems = state.activeItems.map(item => {
+    const activeItems = (state.activeItems || []).map(item => {
       if(!item) {
         return undefined;
       }

diff --git a/src/stores/mercantile/mercantile.ts b/src/stores/mercantile/mercantile.ts
@@ -80,7 +80,7 @@ export class MercantileState {
   async updateAllItems(ctx: StateContext<IGameMercantile>) {
     const state = ctx.getState();
 
-    const shopItems = state.shop.forSale.map(item => {
+    const shopItems = (state.shop.forSale || []).map(item => {
       const baseItem = this.itemCreatorService.createItem(item.internalId || '');
       if(!baseItem) {
         return undefined;
@@ -92,7 +92,7 @@ export class MercantileState {
       };
     }).filter(Boolean);
 
-    const stockpileItems = state.stockpile.items.map(item => {
+    const stockpileItems = (state.stockpile.items || []).map(item => {
       const baseItem = this.itemCreatorService.createItem(item.internalId || '');
       if(!baseItem) {
         return undefined;