From 9e78f216d121f4e9ba41f6cd93ed38a63a02230d Mon Sep 17 00:00:00 2001 From: Derek Monturo Date: Sat, 20 May 2017 09:47:30 -0400 Subject: [PATCH] only fixes 2 of 3 issues with Scarabs. infect damage not triggering it still for #3402 --- Mage.Sets/src/mage/cards/n/NestOfScarabs.java | 2 +- .../org/mage/test/cards/enchantments/NestOfScarabsTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/cards/n/NestOfScarabs.java b/Mage.Sets/src/mage/cards/n/NestOfScarabs.java index 0e9c4a3e45..dafd2c3ebb 100644 --- a/Mage.Sets/src/mage/cards/n/NestOfScarabs.java +++ b/Mage.Sets/src/mage/cards/n/NestOfScarabs.java @@ -82,7 +82,7 @@ class NestOfScarabsTriggeredAbility extends TriggeredAbilityImpl { @Override public boolean checkTrigger(GameEvent event, Game game) { - boolean weAreDoingIt = getControllerId().equals(event.getPlayerId()); + boolean weAreDoingIt = getControllerId().equals(game.getControllerId(event.getSourceId())); boolean isM1M1Counters = event.getData().equals(CounterType.M1M1.getName()); if (weAreDoingIt && isM1M1Counters && event.getAmount() > 0) { Permanent permanent = game.getPermanentOrLKIBattlefield(event.getTargetId()); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/NestOfScarabsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/NestOfScarabsTest.java index 185c45f266..4e72971ff3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/NestOfScarabsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/NestOfScarabsTest.java @@ -86,7 +86,7 @@ public class NestOfScarabsTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - assertPermanentCount(playerA, nestScarabs, 1); + assertPermanentCount(playerA, nestScarabs, 1); assertHandCount(playerA, blackZenith, 0); assertLibraryCount(playerA, blackZenith, 1); // shuffles back into library assertGraveyardCount(playerA, fugitive, 1);