From 3658dc00cba602a24d68e110596cba1902fa2832 Mon Sep 17 00:00:00 2001 From: Susucre <34709007+Susucre@users.noreply.github.com> Date: Wed, 18 Oct 2023 00:09:59 +0200 Subject: [PATCH] fix Zurgo and Ojutai triggering on non-combat damage --- Mage.Sets/src/mage/cards/z/ZurgoAndOjutai.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Mage.Sets/src/mage/cards/z/ZurgoAndOjutai.java b/Mage.Sets/src/mage/cards/z/ZurgoAndOjutai.java index d4ff98c2f06..a1d54af0cb7 100644 --- a/Mage.Sets/src/mage/cards/z/ZurgoAndOjutai.java +++ b/Mage.Sets/src/mage/cards/z/ZurgoAndOjutai.java @@ -21,6 +21,7 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.PermanentIdPredicate; import mage.game.Game; import mage.game.events.DamagedBatchEvent; +import mage.game.events.DamagedEvent; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.players.Player; @@ -101,6 +102,7 @@ class ZurgoAndOjutaiTriggeredAbility extends TriggeredAbilityImpl { List permanents = dEvent .getEvents() .stream() + .filter(DamagedEvent::isCombatDamage) .map(e -> { Permanent permanent = game.getPermanent(e.getSourceId()); Permanent defender = game.getPermanent(e.getTargetId());