From 6af4126bc89ee9ff3ad67fa548ad22de411e8581 Mon Sep 17 00:00:00 2001 From: Dev Date: Sun, 17 Mar 2024 13:33:31 +0000 Subject: [PATCH] Resolve issue with PMCs having seasonal items on their person when they shouldn't --- project/src/generators/PMCLootGenerator.ts | 25 ++++++---------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/project/src/generators/PMCLootGenerator.ts b/project/src/generators/PMCLootGenerator.ts index 05196ff8..ff7d4f93 100644 --- a/project/src/generators/PMCLootGenerator.ts +++ b/project/src/generators/PMCLootGenerator.ts @@ -52,12 +52,8 @@ export class PMCLootGenerator const pmcItemBlacklist = this.pmcConfig.pocketLoot.blacklist; const itemBlacklist = this.itemFilterService.getBlacklistedItems(); - // Blacklist seasonal items if not inside seasonal event - if (!this.seasonalEventService.seasonalEventEnabled()) - { - // Blacklist seasonal items - itemBlacklist.push(...this.seasonalEventService.getInactiveSeasonalEventItems()); - } + // Blacklist inactive seasonal items + itemBlacklist.push(...this.seasonalEventService.getInactiveSeasonalEventItems()); const itemsToAdd = Object.values(items).filter((item) => allowedItemTypes.includes(item._parent) @@ -115,13 +111,8 @@ export class PMCLootGenerator const pmcItemBlacklist = this.pmcConfig.vestLoot.blacklist; const itemBlacklist = this.itemFilterService.getBlacklistedItems(); - // Blacklist seasonal items if not inside seasonal event - // Blacklist seasonal items if not inside seasonal event - if (!this.seasonalEventService.seasonalEventEnabled()) - { - // Blacklist seasonal items - itemBlacklist.push(...this.seasonalEventService.getInactiveSeasonalEventItems()); - } + // Blacklist seasonal items + itemBlacklist.push(...this.seasonalEventService.getInactiveSeasonalEventItems()); const itemsToAdd = Object.values(items).filter((item) => allowedItemTypes.includes(item._parent) @@ -189,12 +180,8 @@ export class PMCLootGenerator const pmcItemBlacklist = this.pmcConfig.backpackLoot.blacklist; const itemBlacklist = this.itemFilterService.getBlacklistedItems(); - // blacklist event items if not inside seasonal event - if (!this.seasonalEventService.seasonalEventEnabled()) - { - // Blacklist seasonal items - itemBlacklist.push(...this.seasonalEventService.getInactiveSeasonalEventItems()); - } + // Blacklist seasonal items + itemBlacklist.push(...this.seasonalEventService.getInactiveSeasonalEventItems()); const itemsToAdd = Object.values(items).filter((item) => allowedItemTypes.includes(item._parent)