github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1844 from drmDev/master

Browse source 
SilentSkimmer and PyreHound bug fixes
This commit is contained in:
Derek M 2016-04-11 11:42:18 -04:00
commit 90507f4c55
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Mage.Sets/src/mage/sets/battleforzendikar/SilentSkimmer.java
View file

@ -60,7 +60,6 @@ public class SilentSkimmer extends CardImpl {
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
// Whenever Silent Skimmer attacks, defending player loses 2 life. // Whenever Silent Skimmer attacks, defending player loses 2 life.
this.addAbility(new AttacksTriggeredAbility(new LoseLifeDefendingPlayerEffect(2, true), false)); this.addAbility(new AttacksTriggeredAbility(new LoseLifeDefendingPlayerEffect(2, true), false));
} }
public SilentSkimmer(final SilentSkimmer card) { public SilentSkimmer(final SilentSkimmer card) {

2
Mage.Sets/src/mage/sets/shadowsoverinnistrad/PyreHound.java
View file

@ -56,7 +56,7 @@ public class PyreHound extends CardImpl {
this.addAbility(TrampleAbility.getInstance()); this.addAbility(TrampleAbility.getInstance());
// Whenever you cast an instant or sorcery spell, put a +1/+1 counter on Pyre Hound. // Whenever you cast an instant or sorcery spell, put a +1/+1 counter on Pyre Hound.
this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()),
new FilterInstantOrSorcerySpell("an instant or sorcery spell"), true)); new FilterInstantOrSorcerySpell("an instant or sorcery spell"), false));
} }
public PyreHound(final PyreHound card) { public PyreHound(final PyreHound card) {

2
Mage.Tests/src/test/java/org/mage/test/cards/watchers/SiftThroughSandsTest.java
View file

@ -36,6 +36,8 @@ public class SiftThroughSandsTest extends CardTestPlayerBase {
* *
*/ */
// TODO: This test fails sometimes if building the complete test project
// The cause is still unknown
// test that The Unspeakable is put onto the battlefield // test that The Unspeakable is put onto the battlefield
@Test @Test
public void testTheUnspeakable() { public void testTheUnspeakable() {

5
Mage/src/main/java/mage/abilities/effects/common/LoseLifeDefendingPlayerEffect.java
View file

@ -41,8 +41,8 @@ import mage.players.Player;
*/ */
public class LoseLifeDefendingPlayerEffect extends OneShotEffect { public class LoseLifeDefendingPlayerEffect extends OneShotEffect {
protected DynamicValue amount; private DynamicValue amount;
protected boolean attackerIsSource; private boolean attackerIsSource;
/** /**
* *
@ -57,6 +57,7 @@ public class LoseLifeDefendingPlayerEffect extends OneShotEffect {
public LoseLifeDefendingPlayerEffect(DynamicValue amount, boolean attackerIsSource) { public LoseLifeDefendingPlayerEffect(DynamicValue amount, boolean attackerIsSource) {
super(Outcome.Damage); super(Outcome.Damage);
this.amount = amount; this.amount = amount;
this.attackerIsSource = attackerIsSource;
} }
public LoseLifeDefendingPlayerEffect(final LoseLifeDefendingPlayerEffect effect) { public LoseLifeDefendingPlayerEffect(final LoseLifeDefendingPlayerEffect effect) {