From aa3f92463344c1c1aff3081e4095095dba8394bb Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Tue, 25 Feb 2025 21:05:18 -0600 Subject: [PATCH] Revert "[Bug] Fix canApplyAbility check #5413" (#5417) This reverts commit 2cc0ac90f88ac6cc1e79a439a4cdf4392d1a650a. --- src/data/ability.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index dcbaa4026f4..5f19af8cea4 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -5152,10 +5152,6 @@ function applySingleAbAttrs( showAbilityInstant: boolean = false, messages: string[] = [] ) { - if (!pokemon?.canApplyAbility(passive) || (passive && (pokemon.getPassiveAbility().id === pokemon.getAbility().id))) { - return; - } - const ability = passive ? pokemon.getPassiveAbility() : pokemon.getAbility(); if (gainedMidTurn && ability.getAttrs(attrType).some(attr => attr instanceof PostSummonAbAttr && !attr.shouldActivateOnGain())) { return; @@ -5449,10 +5445,12 @@ function applyAbAttrsInternal( gainedMidTurn: boolean = false ) { for (const passive of [ false, true ]) { - if (pokemon) { - applySingleAbAttrs(pokemon, passive, attrType, applyFunc, args, gainedMidTurn, simulated, showAbilityInstant, messages); - globalScene.clearPhaseQueueSplice(); + if (!pokemon?.canApplyAbility(passive) || (passive && (pokemon.getPassiveAbility().id === pokemon.getAbility().id))) { + continue; } + + applySingleAbAttrs(pokemon, passive, attrType, applyFunc, args, gainedMidTurn, simulated, showAbilityInstant, messages); + globalScene.clearPhaseQueueSplice(); } }