From 59ad58a968ef8965f5630e2ced8ef8934cfdef13 Mon Sep 17 00:00:00 2001 From: Ordis <134585663+OrdisPrime@users.noreply.github.com> Date: Wed, 19 Feb 2025 22:25:06 +0100 Subject: [PATCH] fix --- .../custom/manageQuestsController.ts | 22 +++++++++++++++++-- src/services/inventoryService.ts | 6 ++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/controllers/custom/manageQuestsController.ts b/src/controllers/custom/manageQuestsController.ts index fc542248..49283bf3 100644 --- a/src/controllers/custom/manageQuestsController.ts +++ b/src/controllers/custom/manageQuestsController.ts @@ -39,7 +39,16 @@ export const manageQuestsController: RequestHandler = async (req, res) => { case "completeAll": { logger.info("completing all quests.."); for (const questKey of allQuestKeys) { - await completeQuest(inventory, questKey); + try { + await completeQuest(inventory, questKey); + } catch (error) { + if (error instanceof Error) { + logger.error( + `Something went wrong completing quest ${questKey}, probably could not add some item` + ); + logger.error(error.message); + } + } //Skip "Watch The Maker" if (questKey === "/Lotus/Types/Keys/NewWarIntroQuest/NewWarIntroKeyChain") { @@ -70,7 +79,16 @@ export const manageQuestsController: RequestHandler = async (req, res) => { logger.info("completing all unlocked quests.."); for (const questKey of inventory.QuestKeys) { console.log("size of questkeys", inventory.QuestKeys.length); - await completeQuest(inventory, questKey.ItemType); + try { + await completeQuest(inventory, questKey.ItemType); + } catch (error) { + if (error instanceof Error) { + logger.error( + `Something went wrong completing quest ${questKey.ItemType}, probably could not add some item` + ); + logger.error(error.message); + } + } //Skip "Watch The Maker" if (questKey.ItemType === "/Lotus/Types/Keys/NewWarIntroQuest/NewWarIntroKeyChain") { diff --git a/src/services/inventoryService.ts b/src/services/inventoryService.ts index 62ae920f..7719b2e8 100644 --- a/src/services/inventoryService.ts +++ b/src/services/inventoryService.ts @@ -367,7 +367,7 @@ export const addItem = async ( }; } if (typeName in ExportKeys) { - // Note: "/Lotus/Types/Keys/" contains some EmailItems and ShipFeatureItems + // Note: "/Lotus/Types/Keys/" contains some EmailItems inventory.QuestKeys.push({ ItemType: typeName }); return { InventoryChanges: { @@ -519,9 +519,7 @@ export const addItem = async ( } break; } - const errorMessage = `unable to add item: ${typeName}`; - logger.error(errorMessage); - return { InventoryChanges: { Error: [{ Error: errorMessage }] } }; + throw new Error(`unable to add item: ${typeName}`); }; export const addItems = async (