From 2eb317c90999d1cb83016f3d82845e859377f2a0 Mon Sep 17 00:00:00 2001 From: Dmitriy K Date: Sat, 13 Jul 2024 14:31:14 -0400 Subject: [PATCH] Fix item reward overrides going out of bounds (#3012) --- src/modifier/modifier-type.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index c8c9cf7c2f3..8fb7544fba2 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -1878,13 +1878,13 @@ export function getPlayerModifierTypeOptions(count: integer, party: PlayerPokemo } options.push(candidate); }); + // OVERRIDE IF NECESSARY - if (Overrides.ITEM_REWARD_OVERRIDE?.length) { - options.forEach((mod, i) => { - const override = modifierTypes[Overrides.ITEM_REWARD_OVERRIDE[i]](); - mod.type = (override instanceof ModifierTypeGenerator ? override.generateType(party) : override) || mod.type; - }); - } + Overrides.ITEM_REWARD_OVERRIDE.forEach((item, i) => { + const override = modifierTypes[item](); + options[i].type = override instanceof ModifierTypeGenerator ? override.generateType(party) : override; + }); + return options; }