From b3f5ea82875f21050364896ab91caabc4acf2432 Mon Sep 17 00:00:00 2001 From: Dev Date: Wed, 9 Aug 2023 11:52:20 +0100 Subject: [PATCH] FIx null excpetion when a weapon reward is picked that has no presets We only want the default preset, so use that function instead --- project/src/controllers/RepeatableQuestController.ts | 3 +-- project/src/helpers/PresetHelper.ts | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/project/src/controllers/RepeatableQuestController.ts b/project/src/controllers/RepeatableQuestController.ts index 8aeb7cfc..e2d7fcd0 100644 --- a/project/src/controllers/RepeatableQuestController.ts +++ b/project/src/controllers/RepeatableQuestController.ts @@ -1077,8 +1077,7 @@ export class RepeatableQuestController } else if (this.itemHelper.isOfBaseclass(itemSelected[0], BaseClasses.WEAPON)) { - const presets = this.presetHelper.getPresets(itemSelected[0]); - const defaultPreset = presets.find(x => x._encyclopedia); + const defaultPreset = this.presetHelper.getDefaultPreset(itemSelected[0]); if (defaultPreset) { children = this.ragfairServerHelper.reparentPresets(defaultPreset._items[0], defaultPreset._items); diff --git a/project/src/helpers/PresetHelper.ts b/project/src/helpers/PresetHelper.ts index 285a6f3e..d526f70f 100644 --- a/project/src/helpers/PresetHelper.ts +++ b/project/src/helpers/PresetHelper.ts @@ -69,6 +69,11 @@ export class PresetHelper return presets; } + /** + * Get the default preset for passed in weapon id + * @param templateId Weapon id to get preset for + * @returns Null if no default preset, otherwise IPreset + */ public getDefaultPreset(templateId: string): IPreset { if (!this.hasPreset(templateId))