mirror of
https://github.com/correl/mage.git
synced 2025-04-10 09:11:04 -09:00
Fixed Desolation Angel.
This commit is contained in:
parent
cc415c586d
commit
62748c511b
1 changed files with 17 additions and 15 deletions
|
@ -42,12 +42,12 @@ import mage.abilities.costs.mana.ManaCost;
|
|||
import mage.abilities.costs.mana.ManaCostsImpl;
|
||||
import mage.abilities.effects.OneShotEffect;
|
||||
import mage.abilities.keyword.KickerAbility;
|
||||
import mage.cards.Card;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.game.Game;
|
||||
import mage.game.permanent.Permanent;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Loki
|
||||
*/
|
||||
public class DesolationAngel extends CardImpl<DesolationAngel> {
|
||||
|
@ -105,9 +105,10 @@ class DesolationAngelEntersBattlefieldEffect extends OneShotEffect<DesolationAng
|
|||
|
||||
@Override
|
||||
public boolean apply(Game game, Ability source) {
|
||||
Permanent p = game.getPermanent(source.getSourceId());
|
||||
if (p != null) {
|
||||
Card p = game.getCard(source.getSourceId());
|
||||
|
||||
boolean kicked = false;
|
||||
if (p != null) {
|
||||
for (Object cost : p.getSpellAbility().getOptionalCosts()) {
|
||||
if (cost instanceof ManaCost) {
|
||||
if (((ManaCost) cost).isPaid()) {
|
||||
|
@ -115,6 +116,8 @@ class DesolationAngelEntersBattlefieldEffect extends OneShotEffect<DesolationAng
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (Permanent permanent : game.getBattlefield().getAllActivePermanents()) {
|
||||
if (permanent.getCardType().contains(CardType.LAND)) {
|
||||
if ((!kicked && permanent.getControllerId() == source.getControllerId()) || kicked) {
|
||||
|
@ -122,10 +125,9 @@ class DesolationAngelEntersBattlefieldEffect extends OneShotEffect<DesolationAng
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public DesolationAngelEntersBattlefieldEffect copy() {
|
||||
|
|
Loading…
Add table
Reference in a new issue