github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 19:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Comet Storm - Fixed wrong damage handling for target players.

Browse source
This commit is contained in:
LevelX2 2015-03-01 18:24:31 +01:00
parent 7ce1e6de19
commit d231eee024
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mage.Sets/src/mage/sets/worldwake/CometStorm.java
View file

@ -53,8 +53,6 @@ public class CometStorm extends CardImpl {
super(ownerId, 76, "Comet Storm", Rarity.MYTHIC, new CardType[]{CardType.INSTANT}, "{X}{R}{R}"); super(ownerId, 76, "Comet Storm", Rarity.MYTHIC, new CardType[]{CardType.INSTANT}, "{X}{R}{R}");
this.expansionSetCode = "WWK"; this.expansionSetCode = "WWK";
this.color.setRed(true);
// Multikicker {1} // Multikicker {1}
this.addAbility(new MultikickerAbility("{1}")); this.addAbility(new MultikickerAbility("{1}"));
@ -96,8 +94,8 @@ class CometStormEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
int damage = source.getManaCostsToPay().getX(); int damage = source.getManaCostsToPay().getX();
Player you = game.getPlayer(source.getControllerId()); Player controller = game.getPlayer(source.getControllerId());
if (you != null) { if (controller != null) {
for (UUID uuid : this.getTargetPointer().getTargets(game, source)) { for (UUID uuid : this.getTargetPointer().getTargets(game, source)) {
Permanent permanent = game.getPermanent(uuid); Permanent permanent = game.getPermanent(uuid);
Player player = game.getPlayer(uuid); Player player = game.getPlayer(uuid);
@ -105,7 +103,7 @@ class CometStormEffect extends OneShotEffect {
permanent.damage(damage, source.getSourceId(), game, false, true); permanent.damage(damage, source.getSourceId(), game, false, true);
} }
if (player != null) { if (player != null) {
player.damage(damage, source.getSourceId(), game, true, false); player.damage(damage, source.getSourceId(), game, false, true);
} }
} }
return true; return true;