Attempt to fix merge conflicts

2024-10-30 21:15:20 -04:00 · 2024-10-30 21:15:20 -04:00 · c2293716b5
parent 77c9fb0daa
commit c2293716b5
1 changed files with 1 additions and 1 deletions
--- a/src/data/move.ts
+++ b/src/data/move.ts
@ -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;
    }