* Grave Betrayal - Reworked card movement and color and subtype applying.

This commit is contained in:
LevelX2 2017-07-23 11:05:32 +02:00
parent 79a72c3b93
commit 94be7cb4da
2 changed files with 66 additions and 18 deletions

View file

@ -34,8 +34,7 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
/**
* @author JRHerlehy
* Created on 4/8/17.
* @author JRHerlehy Created on 4/8/17.
*/
public class BecomesBlackZombieAdditionEffect extends ContinuousEffectImpl {
@ -55,9 +54,14 @@ public class BecomesBlackZombieAdditionEffect extends ContinuousEffectImpl {
@Override
public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
Permanent creature = game.getPermanent(source.getTargets().getFirstTarget());
if (creature == null) {
creature = game.getPermanentEntering(source.getTargets().getFirstTarget());
Permanent creature;
if (source.getTargets().getFirstTarget() == null) {
creature = game.getPermanent(getTargetPointer().getFirst(game, source));
} else {
creature = game.getPermanent(source.getTargets().getFirstTarget());
if (creature == null) {
creature = game.getPermanentEntering(source.getTargets().getFirstTarget());
}
}
if (creature != null) {
switch (layer) {