cdnutter
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix hanging when move has no effect

pull/1/head
Flashfyre 2023-04-24 00:38:28 -04:00
parent c1e048e9af
commit 77b3f136dd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle-phases.ts
View File

@ -907,8 +907,8 @@ abstract class MoveEffectPhase extends PokemonPhase {
// Charge attribute with charge effect takes all effect attributes and applies them to charge stage, so ignore them if this is present // Charge attribute with charge effect takes all effect attributes and applies them to charge stage, so ignore them if this is present
if (!isProtected && target.hp && !this.move.getMove().getAttrs(ChargeAttr).filter(ca => (ca as ChargeAttr).chargeEffect).length) if (!isProtected && target.hp && !this.move.getMove().getAttrs(ChargeAttr).filter(ca => (ca as ChargeAttr).chargeEffect).length)
applyMoveAttrs(MoveHitEffectAttr, user, target, this.move.getMove()); applyMoveAttrs(MoveHitEffectAttr, user, target, this.move.getMove());
this.end();
} }
this.end();
}); });
}); });
} }

2
src/battle-scene.ts
View File

@ -791,7 +791,7 @@ export default class BattleScene extends Phaser.Scene {
if (player === undefined) if (player === undefined)
player = true; player = true;
return new Promise(resolve => { return new Promise(resolve => {
const modifiers = player ? this.modifiers : this.enemyModifiers; const modifiers = player ? this.modifiers : this.enemyModifiers as PersistentModifier[];
for (let modifier of modifiers) { for (let modifier of modifiers) {
if (modifier instanceof PersistentModifier) if (modifier instanceof PersistentModifier)
(modifier as PersistentModifier).virtualStackCount = 0; (modifier as PersistentModifier).virtualStackCount = 0;