Resolve issue with PMCs having seasonal items on their person when they shouldn't
This commit is contained in:
parent
1f16e96ae9
commit
6af4126bc8
@ -52,12 +52,8 @@ export class PMCLootGenerator
|
|||||||
const pmcItemBlacklist = this.pmcConfig.pocketLoot.blacklist;
|
const pmcItemBlacklist = this.pmcConfig.pocketLoot.blacklist;
|
||||||
const itemBlacklist = this.itemFilterService.getBlacklistedItems();
|
const itemBlacklist = this.itemFilterService.getBlacklistedItems();
|
||||||
|
|
||||||
// Blacklist seasonal items if not inside seasonal event
|
// Blacklist inactive seasonal items
|
||||||
if (!this.seasonalEventService.seasonalEventEnabled())
|
itemBlacklist.push(...this.seasonalEventService.getInactiveSeasonalEventItems());
|
||||||
{
|
|
||||||
// Blacklist seasonal items
|
|
||||||
itemBlacklist.push(...this.seasonalEventService.getInactiveSeasonalEventItems());
|
|
||||||
}
|
|
||||||
|
|
||||||
const itemsToAdd = Object.values(items).filter((item) =>
|
const itemsToAdd = Object.values(items).filter((item) =>
|
||||||
allowedItemTypes.includes(item._parent)
|
allowedItemTypes.includes(item._parent)
|
||||||
@ -115,13 +111,8 @@ export class PMCLootGenerator
|
|||||||
const pmcItemBlacklist = this.pmcConfig.vestLoot.blacklist;
|
const pmcItemBlacklist = this.pmcConfig.vestLoot.blacklist;
|
||||||
const itemBlacklist = this.itemFilterService.getBlacklistedItems();
|
const itemBlacklist = this.itemFilterService.getBlacklistedItems();
|
||||||
|
|
||||||
// Blacklist seasonal items if not inside seasonal event
|
// Blacklist seasonal items
|
||||||
// Blacklist seasonal items if not inside seasonal event
|
itemBlacklist.push(...this.seasonalEventService.getInactiveSeasonalEventItems());
|
||||||
if (!this.seasonalEventService.seasonalEventEnabled())
|
|
||||||
{
|
|
||||||
// Blacklist seasonal items
|
|
||||||
itemBlacklist.push(...this.seasonalEventService.getInactiveSeasonalEventItems());
|
|
||||||
}
|
|
||||||
|
|
||||||
const itemsToAdd = Object.values(items).filter((item) =>
|
const itemsToAdd = Object.values(items).filter((item) =>
|
||||||
allowedItemTypes.includes(item._parent)
|
allowedItemTypes.includes(item._parent)
|
||||||
@ -189,12 +180,8 @@ export class PMCLootGenerator
|
|||||||
const pmcItemBlacklist = this.pmcConfig.backpackLoot.blacklist;
|
const pmcItemBlacklist = this.pmcConfig.backpackLoot.blacklist;
|
||||||
const itemBlacklist = this.itemFilterService.getBlacklistedItems();
|
const itemBlacklist = this.itemFilterService.getBlacklistedItems();
|
||||||
|
|
||||||
// blacklist event items if not inside seasonal event
|
// Blacklist seasonal items
|
||||||
if (!this.seasonalEventService.seasonalEventEnabled())
|
itemBlacklist.push(...this.seasonalEventService.getInactiveSeasonalEventItems());
|
||||||
{
|
|
||||||
// Blacklist seasonal items
|
|
||||||
itemBlacklist.push(...this.seasonalEventService.getInactiveSeasonalEventItems());
|
|
||||||
}
|
|
||||||
|
|
||||||
const itemsToAdd = Object.values(items).filter((item) =>
|
const itemsToAdd = Object.values(items).filter((item) =>
|
||||||
allowedItemTypes.includes(item._parent)
|
allowedItemTypes.includes(item._parent)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user