From b745df33629780a1d61714ca08406501aa5ed88f Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Sun, 5 Jun 2022 10:52:27 -0400
Subject: [PATCH] [CLB] fixed initiative damage trigger causing rollback errors
 (#9010)

---
 Mage/src/main/java/mage/designations/Initiative.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Mage/src/main/java/mage/designations/Initiative.java b/Mage/src/main/java/mage/designations/Initiative.java
index 71727a344e3..2d149124b28 100644
--- a/Mage/src/main/java/mage/designations/Initiative.java
+++ b/Mage/src/main/java/mage/designations/Initiative.java
@@ -7,6 +7,7 @@ import mage.constants.Outcome;
 import mage.constants.Zone;
 import mage.game.Controllable;
 import mage.game.Game;
+import mage.game.events.DamagedEvent;
 import mage.game.events.DamagedPlayerBatchEvent;
 import mage.game.events.GameEvent;
 import mage.target.targetpointer.FixedTarget;
@@ -61,13 +62,12 @@ class InitiativeDamageTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (!event.getTargetId().equals(game.getInitiativeId())) {
-            return false;
-        }
         DamagedPlayerBatchEvent dEvent = (DamagedPlayerBatchEvent) event;
         UUID playerId = dEvent
                 .getEvents()
                 .stream()
+                .filter(DamagedEvent::isCombatDamage)
+                .filter(e -> e.getTargetId().equals(game.getInitiativeId()))
                 .map(GameEvent::getSourceId)
                 .map(game::getPermanent)
                 .filter(Objects::nonNull)