Merge branch 'hotfix-1.10.7' into change-touch-inputs

This commit is contained in:
Sirz Benjie 2025-09-07 17:31:14 -05:00 committed by GitHub
commit f86eb962c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 0 deletions

View File

@ -230,6 +230,7 @@ export class EggHatchPhase extends Phase {
} else {
globalScene.time.delayedCall(250, () => globalScene.setModifiersVisible(true));
}
this.pokemon?.destroy();
super.end();
}

View File

@ -39,6 +39,10 @@ export class EggSummaryPhase extends Phase {
}
end() {
this.eggHatchData.forEach(data => {
data.pokemon?.destroy();
});
this.eggHatchData = [];
globalScene.time.delayedCall(250, () => globalScene.setModifiersVisible(true));
globalScene.ui.setModeForceTransition(UiMode.MESSAGE).then(() => {
super.end();