random-mirrors/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-02-16 17:27:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix merge conflicts

Browse Source
This commit is contained in:
Christopher Schmidt 2024-10-30 21:15:20 -04:00
parent 77c9fb0daa
commit c2293716b5
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/data/move.ts
View File

@ -1410,7 +1410,7 @@ export class RecoilAttr extends MoveEffectAttr {
}
// Chloroblast and Struggle should not deal recoil damage if the move was not successful
if (this.useHp && [ MoveResult.FAIL, MoveResult.MISS ].includes(user.getLastXMoves(1)[0]?.result)) {
if (this.useHp && [ MoveResult.FAIL, MoveResult.MISS ].includes(user.getLastXMoves(1)[0]?.result ?? MoveResult.FAIL)) {
return false;
}