From c2293716b50299de8bc8dddc5f585c52e1fa01c9 Mon Sep 17 00:00:00 2001 From: Christopher Schmidt Date: Wed, 30 Oct 2024 21:15:20 -0400 Subject: [PATCH] Attempt to fix merge conflicts --- src/data/move.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/move.ts b/src/data/move.ts index c9b94db2baa..0dca3db7a3f 100644 --- 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; }