From a793aedd290dd53a2ee7546b8ebb97d2a6aa5f07 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Thu, 11 Apr 2024 20:58:24 -0400 Subject: [PATCH] Don't transfer baton item if target is already holding one --- src/phases.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/phases.ts b/src/phases.ts index 015c487f5..480c6c9a3 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -1294,7 +1294,7 @@ export class SwitchSummonPhase extends SummonPhase { if (!this.scene.findModifier(m => m instanceof SwitchEffectTransferModifier && (m as SwitchEffectTransferModifier).pokemonId === switchedPokemon.id)) { const batonPassModifier = this.scene.findModifier(m => m instanceof SwitchEffectTransferModifier && (m as SwitchEffectTransferModifier).pokemonId === this.lastPokemon.id) as SwitchEffectTransferModifier; - if (batonPassModifier) + if (batonPassModifier && !this.scene.findModifier(m => m instanceof SwitchEffectTransferModifier && (m as SwitchEffectTransferModifier).pokemonId === switchedPokemon.id)) this.scene.tryTransferHeldItemModifier(batonPassModifier, switchedPokemon, false, false); } }