diff --git a/Mage.Sets/src/mage/cards/b/BlueDragon.java b/Mage.Sets/src/mage/cards/b/BlueDragon.java
index 1fef28ff94d..d9814d3e86f 100644
--- a/Mage.Sets/src/mage/cards/b/BlueDragon.java
+++ b/Mage.Sets/src/mage/cards/b/BlueDragon.java
@@ -91,7 +91,7 @@ class BlueDragonEffect extends ContinuousEffectImpl {
         int affectedTargets = 0;
         for (Target target : source.getTargets()) {
             Permanent permanent = game.getPermanent(target.getFirstTarget());
-            if (permanent != null && permanent.isCreature()) {
+            if (permanent != null && permanent.isCreature(game)) {
                 permanent.addPower(power);
                 affectedTargets++;
             }
diff --git a/Mage.Sets/src/mage/cards/c/CapriciousHellraiser.java b/Mage.Sets/src/mage/cards/c/CapriciousHellraiser.java
index 9a45be55285..ad3faceb20b 100644
--- a/Mage.Sets/src/mage/cards/c/CapriciousHellraiser.java
+++ b/Mage.Sets/src/mage/cards/c/CapriciousHellraiser.java
@@ -76,13 +76,13 @@ class CapriciousHellraiserEffect extends OneShotEffect {
                 if (card != null) {
                     toExile.add(card);
                     cardsInGraveyard.remove(card);
-                    if (!card.isCreature() && !card.isLand()) {
+                    if (!card.isCreature(game) && !card.isLand(game)) {
                         cardsToChooseFrom.add(card);
                     }
                 }
             }
             controller.moveCards(toExile, Zone.EXILED, source, game);
-            if (cardsToChooseFrom.size() > 0) {
+            if (!cardsToChooseFrom.isEmpty()) {
                 TargetCard targetCard = new TargetCard(1, Zone.EXILED, StaticFilters.FILTER_CARD);
                 controller.choose(Outcome.Copy, cardsToChooseFrom, targetCard, source, game);
                 Card cardToCopy = game.getCard(targetCard.getTargets().get(0));
diff --git a/Mage.Sets/src/mage/cards/c/CarthTheLion.java b/Mage.Sets/src/mage/cards/c/CarthTheLion.java
index 24a202431df..1294637852d 100644
--- a/Mage.Sets/src/mage/cards/c/CarthTheLion.java
+++ b/Mage.Sets/src/mage/cards/c/CarthTheLion.java
@@ -85,7 +85,7 @@ class CarthTheLionTriggeredAbility extends TriggeredAbilityImpl {
             ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
             if (zEvent.isDiesEvent()) {
                 Permanent permanent = game.getPermanentOrLKIBattlefield(zEvent.getTargetId());
-                return permanent != null && permanent.isPlaneswalker();
+                return permanent != null && permanent.isPlaneswalker(game);
             }
         }
         return false;
diff --git a/Mage.Sets/src/mage/cards/d/Desertion.java b/Mage.Sets/src/mage/cards/d/Desertion.java
index e1289cfb2a2..eb2e894e7b8 100644
--- a/Mage.Sets/src/mage/cards/d/Desertion.java
+++ b/Mage.Sets/src/mage/cards/d/Desertion.java
@@ -60,7 +60,7 @@ class DesertionEffect extends OneShotEffect {
             return false;
         }
         return game.getStack().counter(spell.getId(), source, game,
-                spell.isArtifact() || spell.isCreature() ? PutCards.BATTLEFIELD : PutCards.GRAVEYARD
+                spell.isArtifact(game) || spell.isCreature(game) ? PutCards.BATTLEFIELD : PutCards.GRAVEYARD
         );
     }
 }
diff --git a/Mage.Sets/src/mage/cards/e/EtherealValkyrie.java b/Mage.Sets/src/mage/cards/e/EtherealValkyrie.java
index 98b35cc4c64..5eab7aabfd3 100644
--- a/Mage.Sets/src/mage/cards/e/EtherealValkyrie.java
+++ b/Mage.Sets/src/mage/cards/e/EtherealValkyrie.java
@@ -121,7 +121,7 @@ class EtherealValkyrieEffect extends OneShotEffect {
             game.getState().setValue(exileCard.getMainCard().getId().toString() + "Foretell Cost", creatureCost);
             game.getState().setValue(exileCard.getMainCard().getId().toString() + "Foretell Split Cost", spellCost);
             foretellAbility = new ForetellAbility(exileCard, creatureCost, spellCost);
-        } else if (!exileCard.isLand()){
+        } else if (!exileCard.isLand(game)){
             // normal card
             String costText = CardUtil.reduceCost(exileCard.getManaCost(), 2).getText();
             game.getState().setValue(exileCard.getId().toString() + "Foretell Cost", costText);
diff --git a/Mage.Sets/src/mage/cards/f/Fiendlash.java b/Mage.Sets/src/mage/cards/f/Fiendlash.java
index eed9ce6f5d0..3d611a1e03a 100644
--- a/Mage.Sets/src/mage/cards/f/Fiendlash.java
+++ b/Mage.Sets/src/mage/cards/f/Fiendlash.java
@@ -147,11 +147,9 @@ class FiendlashEffect extends OneShotEffect {
         }
 
         Permanent permanent = game.getPermanent(source.getFirstTarget());
-        if (permanent != null) {
-            if (permanent.isPlaneswalker()) {
-                permanent.damage(damage, creature.getId(), source, game);
-                return true;
-            }
+        if (permanent != null && (permanent.isPlaneswalker(game))) {
+            permanent.damage(damage, creature.getId(), source, game);
+            return true;
         }
         Player player = game.getPlayer(source.getFirstTarget());
         if (player != null) {
diff --git a/Mage.Sets/src/mage/cards/g/GaleWaterdeepProdigy.java b/Mage.Sets/src/mage/cards/g/GaleWaterdeepProdigy.java
index c1cf7d778b7..66915bda552 100644
--- a/Mage.Sets/src/mage/cards/g/GaleWaterdeepProdigy.java
+++ b/Mage.Sets/src/mage/cards/g/GaleWaterdeepProdigy.java
@@ -96,7 +96,7 @@ class GaleWaterdeepProdigyTriggeredAbility extends SpellCastControllerTriggeredA
         }
 
         FilterCard filterCard;
-        if (spell.isSorcery()) {
+        if (spell.isSorcery(game)) {
             filterCard = INSTANT_FILTER;
         } else {
             filterCard = SORCERY_FILTER;
diff --git a/Mage.Sets/src/mage/cards/g/GauntletOfPower.java b/Mage.Sets/src/mage/cards/g/GauntletOfPower.java
index 43ae8960667..c940931f858 100644
--- a/Mage.Sets/src/mage/cards/g/GauntletOfPower.java
+++ b/Mage.Sets/src/mage/cards/g/GauntletOfPower.java
@@ -84,7 +84,7 @@ class GauntletOfPowerTapForManaAllTriggeredAbility extends TriggeredManaAbility
     public boolean checkTrigger(GameEvent event, Game game) {
         TappedForManaEvent mEvent = (TappedForManaEvent) event;
         Permanent permanent = mEvent.getPermanent();
-        if (permanent == null || !permanent.isLand() || !permanent.isBasic(game)) {
+        if (permanent == null || !permanent.isLand(game) || !permanent.isBasic(game)) {
             return false;
         }
         ObjectColor color = (ObjectColor) game.getState().getValue(getSourceId() + "_color");
diff --git a/Mage.Sets/src/mage/cards/m/MechanizedWarfare.java b/Mage.Sets/src/mage/cards/m/MechanizedWarfare.java
index 40c483e3c22..065ea875cc1 100644
--- a/Mage.Sets/src/mage/cards/m/MechanizedWarfare.java
+++ b/Mage.Sets/src/mage/cards/m/MechanizedWarfare.java
@@ -87,7 +87,7 @@ class MechanizedWarfareEffect extends ReplacementEffectImpl {
 
         return sourceObject != null
                 && event.getAmount() > 0
-                && (sourceObject.getColor(game).isRed() || sourceObject.isArtifact());
+                && (sourceObject.getColor(game).isRed() || sourceObject.isArtifact(game));
     }
 
     private static UUID getControllerOrSelf(UUID id, Game game) {
@@ -99,4 +99,4 @@ class MechanizedWarfareEffect extends ReplacementEffectImpl {
     public MechanizedWarfareEffect copy() {
         return new MechanizedWarfareEffect(this);
     }
-}
\ No newline at end of file
+}
diff --git a/Mage.Sets/src/mage/cards/s/SithEternalLightning.java b/Mage.Sets/src/mage/cards/s/SithEternalLightning.java
index 0a640ba6202..7107bba8a60 100644
--- a/Mage.Sets/src/mage/cards/s/SithEternalLightning.java
+++ b/Mage.Sets/src/mage/cards/s/SithEternalLightning.java
@@ -64,12 +64,15 @@ class SithEternalLightningEffect extends OneShotEffect {
     @Override
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
+        if (controller == null) {
+            return false;
+        }
         Set<UUID> opponents = game.getOpponents(controller.getId());
-        if (controller != null && opponents != null) {
+        if (opponents != null) {
             for (UUID opponent : opponents) {
                 List<Permanent> permanents = game.getBattlefield().getActivePermanents(opponent, game);
                 for (Permanent permanent : permanents) {
-                    if (permanent.isCreature() && permanent.getControllerId() == opponent) {
+                    if (permanent.isCreature(game) && opponent.equals(permanent.getControllerId())) {
                         permanent.tap(source, game);
                         DontUntapInControllersNextUntapStepTargetEffect effect = new DontUntapInControllersNextUntapStepTargetEffect();
                         effect.setTargetPointer(new FixedTarget(permanent.getId(), game));
diff --git a/Mage.Sets/src/mage/cards/y/YasharnImplacableEarth.java b/Mage.Sets/src/mage/cards/y/YasharnImplacableEarth.java
index 6105644f733..52e7ae8410b 100644
--- a/Mage.Sets/src/mage/cards/y/YasharnImplacableEarth.java
+++ b/Mage.Sets/src/mage/cards/y/YasharnImplacableEarth.java
@@ -166,7 +166,7 @@ class YasharnImplacableEarthEffect extends ContinuousRuleModifyingEffectImpl {
                 return true;  // can't pay with life
             }
             if (cost instanceof SacrificeSourceCost
-                    && !permanent.isLand()) {
+                    && !permanent.isLand(game)) {
                 return true;
             }
             if (cost instanceof SacrificeTargetCost) {