mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-29 11:42:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge issue

Browse Source
This commit is contained in:
NightKev 2025-02-08 17:08:55 -08:00
parent 8469d9f731
commit c3f3c0a1b0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/phases/pokemon-phase.ts
View File

@ -11,7 +11,7 @@ export abstract class PokemonPhase extends FieldPhase {
constructor(battlerIndex?: BattlerIndex | number) { constructor(battlerIndex?: BattlerIndex | number) {
super(); super();
battlerIndex = battlerIndex ?? scene.getField().find(p => p?.isActive())!.getBattlerIndex(); // TODO: is the bang correct here? battlerIndex = battlerIndex ?? globalScene.getField().find(p => p?.isActive())!.getBattlerIndex(); // TODO: is the bang correct here?
if (battlerIndex === undefined) { if (battlerIndex === undefined) {
console.warn("There are no Pokemon on the field!"); // TODO: figure out a suitable fallback behavior console.warn("There are no Pokemon on the field!"); // TODO: figure out a suitable fallback behavior
} }