From ab69e05115a7efc7538149a67861d458245cf6ac Mon Sep 17 00:00:00 2001
From: Susucre <34709007+Susucre@users.noreply.github.com>
Date: Thu, 2 May 2024 10:39:42 +0200
Subject: [PATCH] clean DamagedBatchCouldHaveFiredEvent isCombat

no longer flag to be more in line with other damage events
---
 Mage/src/main/java/mage/game/GameState.java           |  4 +++-
 .../game/events/DamagedBatchCouldHaveFiredEvent.java  | 11 ++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Mage/src/main/java/mage/game/GameState.java b/Mage/src/main/java/mage/game/GameState.java
index 581451503e0..cb64727abaa 100644
--- a/Mage/src/main/java/mage/game/GameState.java
+++ b/Mage/src/main/java/mage/game/GameState.java
@@ -819,9 +819,11 @@ public class GameState implements Serializable, Copyable<GameState> {
     }
 
     // There might be no damage dealt, but we want to fire that damage (in a batch) could have been dealt.
+    // Of note, DamagedBatchCouldHaveFiredEvent is not a batch event in the sense it doesn't contain sub events.
     public void addBatchDamageCouldHaveBeenFired(boolean combat, Game game) {
         for (GameEvent event : simultaneousEvents) {
-            if (event instanceof DamagedBatchCouldHaveFiredEvent && event.getFlag() == combat) {
+            if (event instanceof DamagedBatchCouldHaveFiredEvent
+                    && ((DamagedBatchCouldHaveFiredEvent) event).isCombat() == combat) {
                 return;
             }
         }
diff --git a/Mage/src/main/java/mage/game/events/DamagedBatchCouldHaveFiredEvent.java b/Mage/src/main/java/mage/game/events/DamagedBatchCouldHaveFiredEvent.java
index d999dbece28..99feb79df65 100644
--- a/Mage/src/main/java/mage/game/events/DamagedBatchCouldHaveFiredEvent.java
+++ b/Mage/src/main/java/mage/game/events/DamagedBatchCouldHaveFiredEvent.java
@@ -1,7 +1,5 @@
 package mage.game.events;
 
-import mage.abilities.Ability;
-
 /**
  * Does not contain any info on damage events, and can fire even when all damage is prevented.
  * Fire any time a DAMAGED_BATCH_FOR_ALL could have fired (combat & noncombat).
@@ -11,7 +9,14 @@ import mage.abilities.Ability;
  */
 public class DamagedBatchCouldHaveFiredEvent extends GameEvent {
 
+    private final boolean isCombat;
+
     public DamagedBatchCouldHaveFiredEvent(boolean combat) {
-        super(EventType.DAMAGED_BATCH_COULD_HAVE_FIRED, null, (Ability) null, null, 0, combat);
+        super(EventType.DAMAGED_BATCH_COULD_HAVE_FIRED, null, null, null);
+        this.isCombat = combat;
+    }
+
+    public boolean isCombat() {
+        return isCombat;
     }
 }