github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
drmDev 2016-05-06 12:40:00 -04:00
commit 9a8c05ab6d
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Mage.Sets/src/mage/sets/eventide/Spitemare.java
View file

@ -40,6 +40,7 @@ import mage.constants.Zone;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType; import mage.game.events.GameEvent.EventType;
import mage.game.permanent.Permanent;
import mage.players.Player; import mage.players.Player;
import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetCreatureOrPlayer;
@ -127,10 +128,16 @@ class SpitemareEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Player target = game.getPlayer(source.getFirstTarget()); Player player = game.getPlayer(source.getFirstTarget());
if (target != null) { if (player != null) {
target.damage((Integer) this.getValue("damageAmount"), source.getSourceId(), game, false, true); player.damage((Integer) this.getValue("damageAmount"), source.getSourceId(), game, false, true);
return true;
} }
return true; Permanent permanent = game.getPermanent(source.getFirstTarget());
if (permanent != null) {
permanent.damage((Integer) this.getValue("damageAmount"), source.getSourceId(), game, false, true);
return true;
}
return false;
} }
} }