From 2bab7d3778f988beafba7f0b93ddac774792ff03 Mon Sep 17 00:00:00 2001 From: Adrian T <68144167+torranx@users.noreply.github.com> Date: Tue, 25 Jun 2024 05:32:21 +0800 Subject: [PATCH] [Bug] Fix trainer double battle crash (#2573) * fix double battle crash * remove ! * fixes crash on double battle --- src/field/trainer.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/field/trainer.ts b/src/field/trainer.ts index a582ab4b096..d49a3478791 100644 --- a/src/field/trainer.ts +++ b/src/field/trainer.ts @@ -432,9 +432,9 @@ export default class Trainer extends Phaser.GameObjects.Container { } const party = this.scene.getEnemyParty(); - const nonFaintedPartyMembers = party.slice(this.scene.currentBattle.getBattlerCount()).filter(p => !p.isFainted()).filter(p => !trainerSlot || p.trainerSlot === trainerSlot); - const partyMemberScores = nonFaintedPartyMembers.map(p => { - const playerField = this.scene.getPlayerField(); + const nonFaintedLegalPartyMembers = party.slice(this.scene.currentBattle.getBattlerCount()).filter(p => p.isAllowedInBattle()).filter(p => !trainerSlot || p.trainerSlot === trainerSlot); + const partyMemberScores = nonFaintedLegalPartyMembers.map(p => { + const playerField = this.scene.getPlayerField().filter(p => p.isAllowedInBattle()); let score = 0; for (const playerPokemon of playerField) { score += p.getMatchupScore(playerPokemon);