From 72614524139566117255beef0d7d2db10fdcf768 Mon Sep 17 00:00:00 2001 From: drmDev Date: Mon, 11 Jul 2016 22:04:34 -0400 Subject: [PATCH] SacrificeAllTriggeredAbility bug fix. fixes #1736 --- .../abilities/common/SacrificeAllTriggeredAbility.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/common/SacrificeAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/SacrificeAllTriggeredAbility.java index 291462dc27..3a78659c58 100644 --- a/Mage/src/main/java/mage/abilities/common/SacrificeAllTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/SacrificeAllTriggeredAbility.java @@ -48,21 +48,22 @@ public class SacrificeAllTriggeredAbility extends TriggeredAbilityImpl { @Override public boolean checkTrigger(GameEvent event, Game game) { + boolean sacrificed = false; switch (sacrificingPlayer) { case YOU: if (event.getPlayerId().equals(getControllerId())) { - return false; + sacrificed = true; } break; case OPPONENT: Player controller = game.getPlayer(getControllerId()); if (controller == null || !controller.hasOpponent(event.getPlayerId(), game)) { - return false; + sacrificed = true; } break; } Permanent sacrificedPermanent = game.getPermanentOrLKIBattlefield(event.getTargetId()); - return sacrificedPermanent != null && filter.match(sacrificedPermanent, getSourceId(), getControllerId(), game); + return sacrificed && sacrificedPermanent != null && filter.match(sacrificedPermanent, getSourceId(), getControllerId(), game); } @Override