From 421164986a62bb6729b852c59a735e68c5435753 Mon Sep 17 00:00:00 2001 From: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com> Date: Mon, 24 Feb 2025 15:59:57 -0800 Subject: [PATCH] fix: don't throw an error if questKey already exists (#1003) Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/1003 Co-authored-by: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com> Co-committed-by: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com> --- src/services/inventoryService.ts | 5 ++--- src/services/questService.ts | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/services/inventoryService.ts b/src/services/inventoryService.ts index 92fc007df..597a4bb76 100644 --- a/src/services/inventoryService.ts +++ b/src/services/inventoryService.ts @@ -331,9 +331,8 @@ export const addItem = async ( if (key.chainStages) { const key = addQuestKey(inventory, { ItemType: typeName }); - if (key) { - return { InventoryChanges: { QuestKeys: [key] } }; - } + if (!key) return { InventoryChanges: {} }; + return { InventoryChanges: { QuestKeys: [key] } }; } else { const key = { ItemType: typeName, ItemCount: quantity }; diff --git a/src/services/questService.ts b/src/services/questService.ts index f7b502d5c..65d7e5099 100644 --- a/src/services/questService.ts +++ b/src/services/questService.ts @@ -77,7 +77,7 @@ export const updateQuestStage = ( export const addQuestKey = (inventory: TInventoryDatabaseDocument, questKey: IQuestKeyDatabase) => { if (inventory.QuestKeys.some(q => q.ItemType === questKey.ItemType)) { - logger.error(`quest key ${questKey.ItemType} already exists`); + logger.warn(`Quest key ${questKey.ItemType} already exists. It will not be added`); return; } const index = inventory.QuestKeys.push(questKey);