github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 19:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed a bug of Consume Spirt that the controller gains no life.

Browse source
This commit is contained in:
LevelX2 2013-01-16 15:09:57 +01:00
parent bf59d850a8
commit c97d50cf55
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Mage.Sets/src/mage/sets/magic2010/ConsumeSpirit.java
View file

@ -27,8 +27,9 @@
*/
package mage.sets.magic2010;
import mage.Constants;
import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Outcome;
import mage.Constants.Rarity;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
@ -39,7 +40,7 @@ import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.common.TargetCreatureOrPlayer;
import java.util.UUID;
/**
* @author nantuko
@ -78,7 +79,7 @@ public class ConsumeSpirit extends CardImpl<ConsumeSpirit> {
class ConsumeSpiritEffect extends OneShotEffect<ConsumeSpiritEffect> {
public ConsumeSpiritEffect() {
super(Constants.Outcome.Damage);
super(Outcome.Damage);
staticText = "Consume Spirit deals X damage to target creature or player and you gain X life. Spend only black mana on X";
}
@ -88,21 +89,28 @@ class ConsumeSpiritEffect extends OneShotEffect<ConsumeSpiritEffect> {
@Override
public boolean apply(Game game, Ability source) {
int damage = source.getManaCostsToPay().getX();
if (damage > 0) {
int amount = source.getManaCostsToPay().getX();
if (amount > 0) {
Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source));
if (permanent != null) {
permanent.damage(damage, source.getSourceId(), game, true, false);
permanent.damage(amount, source.getSourceId(), game, true, false);
} else {
Player player = game.getPlayer(getTargetPointer().getFirst(game, source));
if (player != null) {
player.damage(damage, source.getSourceId(), game, false, true);
player.damage(amount, source.getSourceId(), game, false, true);
} else {
return false;
}
}
Player controller = game.getPlayer(source.getSourceId());
if (controller != null) {
controller.gainLife(amount, game);
} else {
return false;
}
}
return true;
}
return false;
}
@Override
public ConsumeSpiritEffect copy() {