mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-07-27 10:42:25 +02:00
Fix merge issue
This commit is contained in:
parent
8469d9f731
commit
c3f3c0a1b0
@ -11,7 +11,7 @@ export abstract class PokemonPhase extends FieldPhase {
|
||||
constructor(battlerIndex?: BattlerIndex | number) {
|
||||
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) {
|
||||
console.warn("There are no Pokemon on the field!"); // TODO: figure out a suitable fallback behavior
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user