From 08d8f405c0cb558eefe7b8f6139d377a5e8ccb4e Mon Sep 17 00:00:00 2001 From: borisflagell Date: Mon, 23 May 2022 19:31:46 +0200 Subject: [PATCH] UI: Fixes #3132 several Sleeve can no longer works concurrently in the same company fixes #3132 fixes #3394 Fixed the faulty possibleJob() logic in Sleeve/UI/TaskSelector --- src/PersonObjects/Sleeve/ui/TaskSelector.tsx | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/PersonObjects/Sleeve/ui/TaskSelector.tsx b/src/PersonObjects/Sleeve/ui/TaskSelector.tsx index 0de75b9b0..e18418e78 100644 --- a/src/PersonObjects/Sleeve/ui/TaskSelector.tsx +++ b/src/PersonObjects/Sleeve/ui/TaskSelector.tsx @@ -44,7 +44,7 @@ interface ITaskDetails { function possibleJobs(player: IPlayer, sleeve: Sleeve): string[] { // Array of all companies that other sleeves are working at - const forbiddenCompanies = []; + const forbiddenCompanies: string[] = []; for (const otherSleeve of player.sleeves) { if (sleeve === otherSleeve) { continue; @@ -54,13 +54,8 @@ function possibleJobs(player: IPlayer, sleeve: Sleeve): string[] { } } const allJobs: string[] = Object.keys(player.jobs); - for (let i = 0; i < allJobs.length; ++i) { - if (!forbiddenCompanies.includes(allJobs[i])) { - allJobs[i]; - } - } - - return allJobs; + + return allJobs.filter((company) => !forbiddenCompanies.includes(company)); } function possibleFactions(player: IPlayer, sleeve: Sleeve): string[] {