mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2024-11-29 18:26:09 +00:00
Fix switch out status moves in wild causing softlock
This commit is contained in:
parent
5d7f69e35f
commit
de87a35b97
@ -2604,6 +2604,13 @@ export class ForceSwitchOutAttr extends MoveEffectAttr {
|
|||||||
switchOutTarget.scene.field.remove(switchOutTarget);
|
switchOutTarget.scene.field.remove(switchOutTarget);
|
||||||
user.scene.queueMessage(getPokemonMessage(switchOutTarget, ' fled!'), null, true, 500);
|
user.scene.queueMessage(getPokemonMessage(switchOutTarget, ' fled!'), null, true, 500);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (move.category === MoveCategory.STATUS && !switchOutTarget.getAlly()?.isActive(true)) {
|
||||||
|
user.scene.clearEnemyHeldItemModifiers();
|
||||||
|
|
||||||
|
user.scene.pushPhase(new BattleEndPhase(user.scene));
|
||||||
|
user.scene.pushPhase(new NewBattlePhase(user.scene));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
resolve(true);
|
resolve(true);
|
||||||
|
Loading…
Reference in New Issue
Block a user