From 1e4007f6da38e0adaa0346fa517b6e63e3945c91 Mon Sep 17 00:00:00 2001 From: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com> Date: Thu, 21 Aug 2025 11:25:50 -0700 Subject: [PATCH] fix(import): accept loadouts without `GEAR` field (#2671) New inventories don't have that field Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/2671 Reviewed-by: Sainan <63328889+sainan@users.noreply.github.com> Co-authored-by: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com> Co-committed-by: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com> --- src/services/importService.ts | 2 +- src/types/saveLoadoutTypes.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/services/importService.ts b/src/services/importService.ts index 3337a2438..518dacf82 100644 --- a/src/services/importService.ts +++ b/src/services/importService.ts @@ -444,7 +444,7 @@ export const importLoadOutPresets = (db: ILoadoutDatabase, client: ILoadOutPrese db.NORMAL_PVP = client.NORMAL_PVP.map(convertLoadOutConfig); db.LUNARO = client.LUNARO.map(convertLoadOutConfig); db.OPERATOR = client.OPERATOR.map(convertLoadOutConfig); - db.GEAR = client.GEAR.map(convertLoadOutConfig); + db.GEAR = client.GEAR?.map(convertLoadOutConfig); db.KDRIVE = client.KDRIVE.map(convertLoadOutConfig); db.DATAKNIFE = client.DATAKNIFE.map(convertLoadOutConfig); db.MECH = client.MECH.map(convertLoadOutConfig); diff --git a/src/types/saveLoadoutTypes.ts b/src/types/saveLoadoutTypes.ts index 9e8e5bf95..33ff97084 100644 --- a/src/types/saveLoadoutTypes.ts +++ b/src/types/saveLoadoutTypes.ts @@ -79,7 +79,7 @@ export interface ILoadoutDatabase { NORMAL_PVP: ILoadoutConfigDatabase[]; LUNARO: ILoadoutConfigDatabase[]; OPERATOR: ILoadoutConfigDatabase[]; - GEAR: ILoadoutConfigDatabase[]; + GEAR?: ILoadoutConfigDatabase[]; KDRIVE: ILoadoutConfigDatabase[]; DATAKNIFE: ILoadoutConfigDatabase[]; MECH: ILoadoutConfigDatabase[]; @@ -96,7 +96,7 @@ export interface ILoadOutPresets { ARCHWING: ILoadoutConfigClient[]; SENTINEL: ILoadoutConfigClient[]; OPERATOR: ILoadoutConfigClient[]; - GEAR: ILoadoutConfigClient[]; + GEAR?: ILoadoutConfigClient[]; KDRIVE: ILoadoutConfigClient[]; DATAKNIFE: ILoadoutConfigClient[]; MECH: ILoadoutConfigClient[];