From 660d554e587d2e33b44dda5782b6235d36fadb83 Mon Sep 17 00:00:00 2001
From: innerthunder <brandonerickson98@gmail.com>
Date: Thu, 29 Aug 2024 02:41:32 -0700
Subject: [PATCH] Fix multi-hit early stopping

---
 src/field/pokemon.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 4c2109b9b33..c0ea9b376fd 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -2257,15 +2257,15 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         source.removeTag(typeBoost.tagType);
       }
 
-      if (cancelled) {
-        return HitResult.NO_EFFECT;
-      }
+      if (cancelled || result === HitResult.IMMUNE || result === HitResult.NO_EFFECT) {
+        source.stopMultiHit(this);
 
-      if (result === HitResult.IMMUNE || result === HitResult.NO_EFFECT) {
-        if (result === HitResult.IMMUNE) {
-          this.scene.queueMessage(i18next.t("battle:hitResultImmune", { pokemonName: getPokemonNameWithAffix(this) }));
-        } else {
-          this.scene.queueMessage(i18next.t("battle:hitResultNoEffect"));
+        if (!cancelled) {
+          if (result === HitResult.IMMUNE) {
+            this.scene.queueMessage(i18next.t("battle:hitResultImmune", { pokemonName: getPokemonNameWithAffix(this) }));
+          } else {
+            this.scene.queueMessage(i18next.t("battle:hitResultNoEffect"));
+          }
         }
         return result;
       }