mirror of
https://github.com/correl/mage.git
synced 2024-11-28 19:19:55 +00:00
fixed Bonfire of the Damned always damaging players even when a planeswalker is targeted
This commit is contained in:
parent
bc899e7ea5
commit
d63278214d
1 changed files with 20 additions and 17 deletions
|
@ -8,8 +8,7 @@ import mage.cards.CardImpl;
|
|||
import mage.cards.CardSetInfo;
|
||||
import mage.constants.CardType;
|
||||
import mage.constants.Outcome;
|
||||
import mage.filter.FilterPermanent;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.StaticFilters;
|
||||
import mage.game.Game;
|
||||
import mage.game.permanent.Permanent;
|
||||
import mage.players.Player;
|
||||
|
@ -33,7 +32,7 @@ public final class BonfireOfTheDamned extends CardImpl {
|
|||
this.addAbility(new MiracleAbility(this, new ManaCostsImpl("{X}{R}")));
|
||||
}
|
||||
|
||||
public BonfireOfTheDamned(final BonfireOfTheDamned card) {
|
||||
private BonfireOfTheDamned(final BonfireOfTheDamned card) {
|
||||
super(card);
|
||||
}
|
||||
|
||||
|
@ -45,31 +44,35 @@ public final class BonfireOfTheDamned extends CardImpl {
|
|||
|
||||
class BonfireOfTheDamnedEffect extends OneShotEffect {
|
||||
|
||||
private static FilterPermanent filter = new FilterCreaturePermanent();
|
||||
|
||||
public BonfireOfTheDamnedEffect() {
|
||||
BonfireOfTheDamnedEffect() {
|
||||
super(Outcome.Damage);
|
||||
staticText = "{this} deals X damage to target player or planeswalker and each creature that player or that planeswalker's controller controls";
|
||||
staticText = "{this} deals X damage to target player or planeswalker " +
|
||||
"and each creature that player or that planeswalker's controller controls";
|
||||
}
|
||||
|
||||
public BonfireOfTheDamnedEffect(final BonfireOfTheDamnedEffect effect) {
|
||||
private BonfireOfTheDamnedEffect(final BonfireOfTheDamnedEffect effect) {
|
||||
super(effect);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean apply(Game game, Ability source) {
|
||||
int damage = source.getManaCostsToPay().getX();
|
||||
if (damage < 1) {
|
||||
return false;
|
||||
}
|
||||
game.damagePlayerOrPlaneswalker(
|
||||
source.getFirstTarget(), damage, source.getSourceId(), game, false, true
|
||||
);
|
||||
Player player = game.getPlayerOrPlaneswalkerController(source.getFirstTarget());
|
||||
if (player != null) {
|
||||
int damage = source.getManaCostsToPay().getX();
|
||||
if (damage > 0) {
|
||||
player.damage(damage, source.getSourceId(), game);
|
||||
for (Permanent perm : game.getBattlefield().getAllActivePermanents(filter, player.getId(), game)) {
|
||||
perm.damage(damage, source.getSourceId(), game);
|
||||
}
|
||||
}
|
||||
if (player == null) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
for (Permanent perm : game.getBattlefield().getAllActivePermanents(
|
||||
StaticFilters.FILTER_PERMANENT_CREATURE, player.getId(), game
|
||||
)) {
|
||||
perm.damage(damage, source.getSourceId(), game);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Loading…
Reference in a new issue