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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Oleg Agafonov 2019-01-13 01:49:04 +04:00
commit aa2fd89ab6
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/g/GrotesqueDemise.java
View file

@ -28,7 +28,7 @@ public final class GrotesqueDemise extends CardImpl {
// Exile target creature with power 3 or less. // Exile target creature with power 3 or less.
this.getSpellAbility().addEffect(new ExileTargetEffect()); this.getSpellAbility().addEffect(new ExileTargetEffect());
this.getSpellAbility().addTarget(new TargetPermanent()); this.getSpellAbility().addTarget(new TargetPermanent(filter));
} }
private GrotesqueDemise(final GrotesqueDemise card) { private GrotesqueDemise(final GrotesqueDemise card) {

4
Mage.Sets/src/mage/cards/k/KayasWrath.java
View file

@ -59,8 +59,8 @@ class KayasWrathEffect extends OneShotEffect {
StaticFilters.FILTER_PERMANENT_CREATURE, StaticFilters.FILTER_PERMANENT_CREATURE,
source.getControllerId(), source.getSourceId(), game source.getControllerId(), source.getSourceId(), game
)) { )) {
boolean isMine = permanent != null && permanent.getControllerId().equals(source.getControllerId()); boolean isMine = permanent != null && permanent.isControlledBy(source.getControllerId());
if (isMine && permanent.destroy(source.getSourceId(), game, false)) { if (permanent.destroy(source.getSourceId(), game, false) && isMine) {
counter++; counter++;
} }
} }

6
Mage.Sets/src/mage/cards/s/SilhanaWayfinder.java
View file

@ -42,7 +42,11 @@ public final class SilhanaWayfinder extends CardImpl {
this.addAbility(new EntersBattlefieldTriggeredAbility(new LookLibraryAndPickControllerEffect( this.addAbility(new EntersBattlefieldTriggeredAbility(new LookLibraryAndPickControllerEffect(
new StaticValue(4), false, new StaticValue(1), filter, Zone.LIBRARY, false, new StaticValue(4), false, new StaticValue(1), filter, Zone.LIBRARY, false,
true, false, Zone.LIBRARY, false, true, false true, false, Zone.LIBRARY, false, true, false
), false)); ).setText("look at the top four cards of your library. " +
"You may reveal a creature or land card from among them " +
"and put it on top of your library. Put the rest " +
"on the bottom of your library in a random order."), false
));
} }
private SilhanaWayfinder(final SilhanaWayfinder card) { private SilhanaWayfinder(final SilhanaWayfinder card) {