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

Fix freeze on catching Pokemon

pull/2/head
Flashfyre 2023-11-01 10:38:54 -04:00
parent 74f6e9a8f2
commit ccb0245889
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/battle-scene.ts
View File

@ -1126,13 +1126,12 @@ export default class BattleScene extends Phaser.Scene {
this.playSound(soundName); this.playSound(soundName);
} else if (!virtual) { } else if (!virtual) {
const defaultModifierType = getDefaultModifierTypeForTier(modifier.type.tier); const defaultModifierType = getDefaultModifierTypeForTier(modifier.type.tier);
this.addModifier(defaultModifierType.newModifier(), ignoreUpdate, playSound).then(() => resolve());
this.queueMessage(`The stack for this item is full.\n You will receive ${defaultModifierType.name} instead.`, null, true); this.queueMessage(`The stack for this item is full.\n You will receive ${defaultModifierType.name} instead.`, null, true);
return; return this.addModifier(defaultModifierType.newModifier(), ignoreUpdate, playSound).then(() => resolve());
} }
if (!ignoreUpdate && !virtual) if (!ignoreUpdate && !virtual)
this.updateModifiers().then(() => resolve()); return this.updateModifiers().then(() => resolve());
} else if (modifier instanceof ConsumableModifier) { } else if (modifier instanceof ConsumableModifier) {
if (playSound && !this.sound.get(soundName)) if (playSound && !this.sound.get(soundName))
this.playSound(soundName); this.playSound(soundName);
@ -1155,15 +1154,15 @@ export default class BattleScene extends Phaser.Scene {
modifier.apply(args); modifier.apply(args);
} }
Promise.allSettled(this.party.map(p => p.updateInfo())).then(() => resolve()); return Promise.allSettled(this.party.map(p => p.updateInfo())).then(() => resolve());
} else { } else {
const args = [ this ]; const args = [ this ];
if (modifier.shouldApply(args)) if (modifier.shouldApply(args))
modifier.apply(args); modifier.apply(args);
resolve();
} }
} }
resolve();
}); });
} }