github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-10 01:01:05 -09:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request from drmDev/master

Browse source 
only fixes 2 of 3 issues with Scarabs. infect damage not triggering infect still for
This commit is contained in:
Derek M 2017-05-20 09:48:16 -04:00 • committed by GitHub
commit 74ad6004f0
2 changed files with 2 additions and 2 deletions
Mage.Sets/src/mage/cards/n
NestOfScarabs.java
Mage.Tests/src/test/java/org/mage/test/cards/enchantments
NestOfScarabsTest.java

2
Mage.Sets/src/mage/cards/n/NestOfScarabs.java
View file

@ -82,7 +82,7 @@ class NestOfScarabsTriggeredAbility extends TriggeredAbilityImpl {
@Override @Override
public boolean checkTrigger(GameEvent event, Game game) { 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()); boolean isM1M1Counters = event.getData().equals(CounterType.M1M1.getName());
if (weAreDoingIt && isM1M1Counters && event.getAmount() > 0) { if (weAreDoingIt && isM1M1Counters && event.getAmount() > 0) {
Permanent permanent = game.getPermanentOrLKIBattlefield(event.getTargetId()); Permanent permanent = game.getPermanentOrLKIBattlefield(event.getTargetId());

2
Mage.Tests/src/test/java/org/mage/test/cards/enchantments/NestOfScarabsTest.java
View file

@ -86,7 +86,7 @@ public class NestOfScarabsTest extends CardTestPlayerBase {
setStopAt(1, PhaseStep.BEGIN_COMBAT); setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute(); execute();
assertPermanentCount(playerA, nestScarabs, 1); assertPermanentCount(playerA, nestScarabs, 1);
assertHandCount(playerA, blackZenith, 0); assertHandCount(playerA, blackZenith, 0);
assertLibraryCount(playerA, blackZenith, 1); // shuffles back into library assertLibraryCount(playerA, blackZenith, 1); // shuffles back into library
assertGraveyardCount(playerA, fugitive, 1); assertGraveyardCount(playerA, fugitive, 1);