Fix bug with fainting on force switch out
Fix bug with fainting on force switch out; move overrides in Pokemon to BattleScene
This commit is contained in:
1 parent
72dc263552
commit
96288d29ce
4 files changed
+15
-12
No files matched your search
+4
-1
@@ -2189,7 +2189,10 @@ export class ForceSwitchOutAttr extends MoveEffectAttr {
|
||||
return resolve(false);
|
||||
const switchOutTarget = this.user ? user : target;
|
||||
if (switchOutTarget instanceof PlayerPokemon) {
|
||||
(switchOutTarget as PlayerPokemon).switchOut(this.batonPass, true).then(() => resolve(true));
|
||||
if (switchOutTarget.hp)
|
||||
(switchOutTarget as PlayerPokemon).switchOut(this.batonPass, true).then(() => resolve(true));
|
||||
else
|
||||
resolve(false);
|
||||
return;
|
||||
} else if (user.scene.currentBattle.battleType) {
|
||||
switchOutTarget.resetTurnData();
|
||||
|
||||
Reference in new issue
Block a user