Merge pull request #2946 from ingmargoudt/master

various rewrites
This commit is contained in:
ingmargoudt 2017-03-07 22:29:13 +01:00 committed by GitHub
commit 603984c8b0
33 changed files with 156 additions and 166 deletions

View file

@ -30,6 +30,7 @@ package mage.cards.g;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
@ -112,7 +113,7 @@ class GhostlyFlickerEffect extends OneShotEffect {
Set<Card> toBattlefield = new HashSet<>();
for (Card card : toExile) {
Zone currentZone = game.getState().getZone(card.getId());
if (!(Zone.BATTLEFIELD == currentZone) && Zone.isPublicZone(currentZone)) {
if (Zone.BATTLEFIELD != currentZone && currentZone.isPublicZone()) {
toBattlefield.add(game.getCard(card.getId()));
}
}