Skip to content

Commit 656a447

Browse files
authored
fix(beta): don't ignore session data for fixed battle waves (#7146)
1 parent 2ad39d1 commit 656a447

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/battle-scene.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,8 +1283,8 @@ export class BattleScene extends SceneBase {
12831283

12841284
/**
12851285
* Create and initialize a new battle.
1286-
* @param fromSession - The {@linkcode SessionSaveData} being used to seed the battle.
1287-
* Should be omitted if not loading an existing save file.
1286+
* @param fromSession - The {@linkcode SessionSaveData} being used to seed the battle. \
1287+
* Should be omitted if not loading an existing save file.
12881288
* @returns The newly created `Battle` instance.
12891289
*/
12901290
public newBattle(fromSession?: SessionSaveData): Battle {
@@ -1296,10 +1296,10 @@ export class BattleScene extends SceneBase {
12961296
this.resetSeed(waveIndex);
12971297

12981298
// Set attributes of the `resolved` object based on the type of battle being created.
1299-
if (this.gameMode.isFixedBattle(waveIndex)) {
1300-
this.handleFixedBattle(resolved);
1301-
} else if (fromSession) {
1299+
if (fromSession) {
13021300
this.handleSavedBattle(resolved, props);
1301+
} else if (this.gameMode.isFixedBattle(waveIndex)) {
1302+
this.handleFixedBattle(resolved);
13031303
} else {
13041304
this.handleNonFixedBattle(resolved);
13051305
}

0 commit comments

Comments
 (0)