mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-08-07 16:09:27 +02:00
Merge d34dcf7bea
into 3b36ab17e4
This commit is contained in:
commit
03015748f8
@ -6309,6 +6309,9 @@ class ForceSwitchOutHelper {
|
|||||||
if (globalScene.currentBattle.double && !isNullOrUndefined(allyPokemon)) {
|
if (globalScene.currentBattle.double && !isNullOrUndefined(allyPokemon)) {
|
||||||
globalScene.redirectPokemonMoves(switchOutTarget, allyPokemon);
|
globalScene.redirectPokemonMoves(switchOutTarget, allyPokemon);
|
||||||
}
|
}
|
||||||
|
else{
|
||||||
|
globalScene.phaseManager.pushNew("BattleEndPhase", true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!allyPokemon?.isActive(true)) {
|
if (!allyPokemon?.isActive(true)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user