diff --git a/Mage.Sets/src/mage/cards/a/AlhammarretsArchive.java b/Mage.Sets/src/mage/cards/a/AlhammarretsArchive.java
index 557b806e6a..02b087e0ab 100644
--- a/Mage.Sets/src/mage/cards/a/AlhammarretsArchive.java
+++ b/Mage.Sets/src/mage/cards/a/AlhammarretsArchive.java
@@ -111,7 +111,7 @@ class AlhammarretsArchiveReplacementEffect extends ReplacementEffectImpl {
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
         if (event.getPlayerId().equals(source.getControllerId())) {
-            if (game.getActivePlayerId().equals(event.getPlayerId())
+            if (game.isActivePlayer(event.getPlayerId())
                     && game.getPhase().getStep().getType() == PhaseStep.DRAW) {
                 CardsDrawnDuringDrawStepWatcher watcher = (CardsDrawnDuringDrawStepWatcher) game.getState().getWatchers().get(CardsDrawnDuringDrawStepWatcher.class.getSimpleName());
                 if (watcher != null && watcher.getAmountCardsDrawn(event.getPlayerId()) > 0) {
diff --git a/Mage.Sets/src/mage/cards/a/AngelicArbiter.java b/Mage.Sets/src/mage/cards/a/AngelicArbiter.java
index 0415e145bf..75693f80c0 100644
--- a/Mage.Sets/src/mage/cards/a/AngelicArbiter.java
+++ b/Mage.Sets/src/mage/cards/a/AngelicArbiter.java
@@ -65,7 +65,7 @@ class AngelicArbiterCantAttackTargetEffect extends RestrictionEffect {
 
     @Override
     public boolean applies(Permanent permanent, Ability source, Game game) {
-        if (game.getActivePlayerId().equals(permanent.getControllerId()) && game.getOpponents(source.getControllerId()).contains(permanent.getControllerId())) {
+        if (game.isActivePlayer(permanent.getControllerId()) && game.getOpponents(source.getControllerId()).contains(permanent.getControllerId())) {
             CastSpellLastTurnWatcher watcher = (CastSpellLastTurnWatcher) game.getState().getWatchers().get(CastSpellLastTurnWatcher.class.getSimpleName());
             if (watcher != null && watcher.getAmountOfSpellsPlayerCastOnCurrentTurn(permanent.getControllerId()) > 0) {
                 return true;
@@ -113,7 +113,7 @@ class AngelicArbiterEffect2 extends ContinuousRuleModifyingEffectImpl {
 
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (game.getActivePlayerId().equals(event.getPlayerId()) && game.getOpponents(source.getControllerId()).contains(event.getPlayerId())) {
+        if (game.isActivePlayer(event.getPlayerId()) && game.getOpponents(source.getControllerId()).contains(event.getPlayerId())) {
             PlayerAttackedWatcher watcher = (PlayerAttackedWatcher) game.getState().getWatchers().get(PlayerAttackedWatcher.class.getSimpleName());
             if (watcher != null && watcher.getNumberOfAttackersCurrentTurn(event.getPlayerId()) > 0) {
                 return true;
diff --git a/Mage.Sets/src/mage/cards/a/AngelicBenediction.java b/Mage.Sets/src/mage/cards/a/AngelicBenediction.java
index fdd6db3234..8271766147 100644
--- a/Mage.Sets/src/mage/cards/a/AngelicBenediction.java
+++ b/Mage.Sets/src/mage/cards/a/AngelicBenediction.java
@@ -62,7 +62,7 @@ class AngelicBenedictionTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (game.getActivePlayerId().equals(this.controllerId)) {
+        if (game.isActivePlayer(this.controllerId)) {
             if (game.getCombat().attacksAlone()) {
                 return true;
             }
diff --git a/Mage.Sets/src/mage/cards/a/AssaultSuit.java b/Mage.Sets/src/mage/cards/a/AssaultSuit.java
index 3020310195..ac21d9ab6b 100644
--- a/Mage.Sets/src/mage/cards/a/AssaultSuit.java
+++ b/Mage.Sets/src/mage/cards/a/AssaultSuit.java
@@ -95,7 +95,7 @@ public final class AssaultSuit extends CardImpl {
     public boolean applies(GameEvent event, Ability source, Game game) {
         if (event.getType() == GameEvent.EventType.SACRIFICE_PERMANENT) {
             Permanent equipment = game.getPermanent(source.getSourceId());
-            if (equipment != null && equipment.getAttachedTo() != null) {
+            if (equipment != null) {
                 return equipment.isAttachedTo(event.getTargetId());
             }
         }
diff --git a/Mage.Sets/src/mage/cards/a/AzorTheLawbringer.java b/Mage.Sets/src/mage/cards/a/AzorTheLawbringer.java
index d879c1e609..0933ac1fa1 100644
--- a/Mage.Sets/src/mage/cards/a/AzorTheLawbringer.java
+++ b/Mage.Sets/src/mage/cards/a/AzorTheLawbringer.java
@@ -123,7 +123,7 @@ class AzorTheLawbringerCantCastEffect extends ContinuousRuleModifyingEffectImpl
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
         UUID opponentId = getTargetPointer().getFirst(game, source);
-        if (game.getActivePlayerId().equals(opponentId)) {
+        if (game.isActivePlayer(opponentId)) {
             if (playersNextTurn == 0) {
                 playersNextTurn = game.getTurnNum();
             }
diff --git a/Mage.Sets/src/mage/cards/b/BattlegraceAngel.java b/Mage.Sets/src/mage/cards/b/BattlegraceAngel.java
index 10b675c1e7..62e5d7ea98 100644
--- a/Mage.Sets/src/mage/cards/b/BattlegraceAngel.java
+++ b/Mage.Sets/src/mage/cards/b/BattlegraceAngel.java
@@ -77,7 +77,7 @@ class BattlegraceAngelAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (game.getActivePlayerId().equals(this.controllerId) ) {
+        if (game.isActivePlayer(this.controllerId) ) {
             if (game.getCombat().attacksAlone()) {
                 for (Effect effect: this.getEffects()) {
                     effect.setTargetPointer(new FixedTarget(game.getCombat().getAttackers().get(0)));
diff --git a/Mage.Sets/src/mage/cards/c/ChainsOfMephistopheles.java b/Mage.Sets/src/mage/cards/c/ChainsOfMephistopheles.java
index 664d9387ab..04f12fe4cf 100644
--- a/Mage.Sets/src/mage/cards/c/ChainsOfMephistopheles.java
+++ b/Mage.Sets/src/mage/cards/c/ChainsOfMephistopheles.java
@@ -85,7 +85,7 @@ class ChainsOfMephistophelesReplacementEffect extends ReplacementEffectImpl {
     
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (game.getActivePlayerId().equals(event.getPlayerId()) && game.getPhase().getStep().getType() == PhaseStep.DRAW) {
+        if (game.isActivePlayer(event.getPlayerId()) && game.getPhase().getStep().getType() == PhaseStep.DRAW) {
             CardsDrawnDuringDrawStepWatcher watcher = (CardsDrawnDuringDrawStepWatcher) game.getState().getWatchers().get(CardsDrawnDuringDrawStepWatcher.class.getSimpleName());
             if (watcher != null && watcher.getAmountCardsDrawn(event.getPlayerId()) > 0) {
                 return true;
diff --git a/Mage.Sets/src/mage/cards/c/ChancellorOfTheTangle.java b/Mage.Sets/src/mage/cards/c/ChancellorOfTheTangle.java
index d7a2f94c46..3b61a92463 100644
--- a/Mage.Sets/src/mage/cards/c/ChancellorOfTheTangle.java
+++ b/Mage.Sets/src/mage/cards/c/ChancellorOfTheTangle.java
@@ -67,7 +67,7 @@ class ChancellorOfTheTangleDelayedTriggeredAbility extends DelayedTriggeredAbili
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        return game.getActivePlayerId().equals(controllerId);
+        return game.isActivePlayer(controllerId);
     }
     @Override
     public ChancellorOfTheTangleDelayedTriggeredAbility copy() {
diff --git a/Mage.Sets/src/mage/cards/c/ChronicFlooding.java b/Mage.Sets/src/mage/cards/c/ChronicFlooding.java
index e20d623828..62f452388d 100644
--- a/Mage.Sets/src/mage/cards/c/ChronicFlooding.java
+++ b/Mage.Sets/src/mage/cards/c/ChronicFlooding.java
@@ -72,10 +72,9 @@ class ChronicFloodingAbility extends TriggeredAbilityImpl {
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
         Permanent source = game.getPermanent(this.sourceId);
-        if (source != null && source.getAttachedTo().equals(event.getTargetId())) {
+        if (source != null && source.isAttachedTo(event.getTargetId())) {
             Permanent attached = game.getPermanent(source.getAttachedTo());
             if (attached != null) {
-
                 for (Effect e : getEffects()) {
                     e.setTargetPointer(new FixedTarget(attached.getControllerId()));
                 }
diff --git a/Mage.Sets/src/mage/cards/c/CityOfSolitude.java b/Mage.Sets/src/mage/cards/c/CityOfSolitude.java
index 40becef9f8..01291a6252 100644
--- a/Mage.Sets/src/mage/cards/c/CityOfSolitude.java
+++ b/Mage.Sets/src/mage/cards/c/CityOfSolitude.java
@@ -67,7 +67,7 @@ class CityOfSolitudeEffect extends ContinuousRuleModifyingEffectImpl {
 
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        return !game.getActivePlayerId().equals(event.getPlayerId());
+        return !game.isActivePlayer(event.getPlayerId());
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/c/CommuneWithLava.java b/Mage.Sets/src/mage/cards/c/CommuneWithLava.java
index a047413986..e38056a591 100644
--- a/Mage.Sets/src/mage/cards/c/CommuneWithLava.java
+++ b/Mage.Sets/src/mage/cards/c/CommuneWithLava.java
@@ -105,7 +105,7 @@ class CommuneWithLavaMayPlayEffect extends AsThoughEffectImpl {
     @Override
     public boolean isInactive(Ability source, Game game) {
         if (castOnTurn != game.getTurnNum() && game.getPhase().getStep().getType() == PhaseStep.END_TURN) {
-            if (game.getActivePlayerId().equals(source.getControllerId())) {
+            if (game.isActivePlayer(source.getControllerId())) {
                 return true;
             }
         }
diff --git a/Mage.Sets/src/mage/cards/c/ConquerorsFlail.java b/Mage.Sets/src/mage/cards/c/ConquerorsFlail.java
index 3a35053555..477cd898b8 100644
--- a/Mage.Sets/src/mage/cards/c/ConquerorsFlail.java
+++ b/Mage.Sets/src/mage/cards/c/ConquerorsFlail.java
@@ -149,7 +149,7 @@ class ConquerorsFlailEffect extends ContinuousRuleModifyingEffectImpl {
             }
         }
 
-        if (isAttached && game.getActivePlayerId().equals(source.getControllerId())
+        if (isAttached && game.isActivePlayer(source.getControllerId())
                 && game.getPlayer(source.getControllerId()).hasOpponent(event.getPlayerId(), game)) {
             return true;
         }
diff --git a/Mage.Sets/src/mage/cards/c/CowedByWisdom.java b/Mage.Sets/src/mage/cards/c/CowedByWisdom.java
index 5561417e05..7559402bc1 100644
--- a/Mage.Sets/src/mage/cards/c/CowedByWisdom.java
+++ b/Mage.Sets/src/mage/cards/c/CowedByWisdom.java
@@ -80,7 +80,7 @@ class CowedByWisdomayCostToAttackBlockEffect extends PayCostToAttackBlockEffectI
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
         Permanent enchantment = game.getPermanent(source.getSourceId());
-        return enchantment != null && enchantment.getAttachedTo().equals(event.getSourceId());
+        return enchantment != null && enchantment.isAttachedTo(event.getSourceId());
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/c/CruelReality.java b/Mage.Sets/src/mage/cards/c/CruelReality.java
index 40417f03cb..ed9a9e2904 100644
--- a/Mage.Sets/src/mage/cards/c/CruelReality.java
+++ b/Mage.Sets/src/mage/cards/c/CruelReality.java
@@ -85,7 +85,7 @@ class CruelRealityTriggeredAbiilty extends TriggeredAbilityImpl {
                 && enchantment.getAttachedTo() != null) {
             Player cursedPlayer = game.getPlayer(enchantment.getAttachedTo());
             if (cursedPlayer != null
-                    && game.getActivePlayerId().equals(cursedPlayer.getId())) {
+                    && game.isActivePlayer(cursedPlayer.getId())) {
                 this.getEffects().get(0).setTargetPointer(new FixedTarget(cursedPlayer.getId()));
                 return true;
             }
diff --git a/Mage.Sets/src/mage/cards/c/CurseOfBloodletting.java b/Mage.Sets/src/mage/cards/c/CurseOfBloodletting.java
index 8363d4848d..7fe65e9355 100644
--- a/Mage.Sets/src/mage/cards/c/CurseOfBloodletting.java
+++ b/Mage.Sets/src/mage/cards/c/CurseOfBloodletting.java
@@ -1,7 +1,6 @@
 
 package mage.cards.c;
 
-import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.ReplacementEffectImpl;
@@ -16,14 +15,15 @@ import mage.game.permanent.Permanent;
 import mage.target.TargetPlayer;
 import mage.util.CardUtil;
 
+import java.util.UUID;
+
 /**
- *
  * @author BetaSteward
  */
 public final class CurseOfBloodletting extends CardImpl {
 
     public CurseOfBloodletting(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}{R}");
         this.subtype.add(SubType.AURA, SubType.CURSE);
 
 
@@ -71,10 +71,9 @@ class CurseOfBloodlettingEffect extends ReplacementEffectImpl {
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
         Permanent enchantment = game.getPermanent(source.getSourceId());
-        if (enchantment != null && 
-                enchantment.getAttachedTo() != null &&
-                event.getTargetId().equals(enchantment.getAttachedTo())) {
-                return true;
+        if (enchantment != null &&
+                enchantment.isAttachedTo(event.getTargetId())) {
+            return true;
         }
         return false;
     }
diff --git a/Mage.Sets/src/mage/cards/c/CurseOfOblivion.java b/Mage.Sets/src/mage/cards/c/CurseOfOblivion.java
index e31da408ec..a12ec39a26 100644
--- a/Mage.Sets/src/mage/cards/c/CurseOfOblivion.java
+++ b/Mage.Sets/src/mage/cards/c/CurseOfOblivion.java
@@ -79,7 +79,7 @@ class CurseOfOblivionAbility extends TriggeredAbilityImpl {
         Permanent enchantment = game.getPermanent(this.sourceId);
         if (enchantment != null && enchantment.getAttachedTo() != null) {
             Player player = game.getPlayer(enchantment.getAttachedTo());
-            if (player != null && game.getActivePlayerId().equals(player.getId())) {
+            if (player != null && game.isActivePlayer(player.getId())) {
                 this.getEffects().get(0).setTargetPointer(new FixedTarget(player.getId()));
                 return true;
             }
diff --git a/Mage.Sets/src/mage/cards/c/CurseOfOpulence.java b/Mage.Sets/src/mage/cards/c/CurseOfOpulence.java
index 6156af8739..c6c9359074 100644
--- a/Mage.Sets/src/mage/cards/c/CurseOfOpulence.java
+++ b/Mage.Sets/src/mage/cards/c/CurseOfOpulence.java
@@ -78,7 +78,7 @@ class CurseOfOpulenceEffect extends OneShotEffect {
         if (enchantment != null) {
             Player enchantedPlayer = game.getPlayer(enchantment.getAttachedTo());
             if (enchantedPlayer != null) {
-                Set<UUID> players = new HashSet();
+                Set<UUID> players = new HashSet<>();
                 for (UUID attacker : game.getCombat().getAttackers()) {
                     UUID defender = game.getCombat().getDefenderId(attacker);
                     if (defender.equals(enchantedPlayer.getId())
diff --git a/Mage.Sets/src/mage/cards/c/CurseOfPredation.java b/Mage.Sets/src/mage/cards/c/CurseOfPredation.java
index be79d9fec4..a130d37685 100644
--- a/Mage.Sets/src/mage/cards/c/CurseOfPredation.java
+++ b/Mage.Sets/src/mage/cards/c/CurseOfPredation.java
@@ -84,8 +84,7 @@ class CurseOfPredationTriggeredAbility extends TriggeredAbilityImpl {
         if (defender != null) {
             Permanent enchantment = game.getPermanent(this.getSourceId());
             if (enchantment != null
-                    && enchantment.getAttachedTo() != null
-                    && enchantment.getAttachedTo().equals(defender.getId())) {
+                    && enchantment.isAttachedTo(defender.getId())) {
                 for (Effect effect: this.getEffects()) {
                     effect.setTargetPointer(new FixedTarget(event.getSourceId()));
                 }
diff --git a/Mage.Sets/src/mage/cards/c/CurseOfTheBloodyTome.java b/Mage.Sets/src/mage/cards/c/CurseOfTheBloodyTome.java
index dc12e4ebdc..18040ebb79 100644
--- a/Mage.Sets/src/mage/cards/c/CurseOfTheBloodyTome.java
+++ b/Mage.Sets/src/mage/cards/c/CurseOfTheBloodyTome.java
@@ -79,7 +79,7 @@ class CurseOfTheBloodyTomeAbility extends TriggeredAbilityImpl {
         Permanent enchantment = game.getPermanent(this.sourceId);
         if (enchantment != null && enchantment.getAttachedTo() != null) {
             Player player = game.getPlayer(enchantment.getAttachedTo());
-            if (player != null && game.getActivePlayerId().equals(player.getId())) {
+            if (player != null && game.isActivePlayer(player.getId())) {
                 this.getEffects().get(0).setTargetPointer(new FixedTarget(player.getId()));
                 return true;
             }
diff --git a/Mage.Sets/src/mage/cards/c/CurseOfTheForsaken.java b/Mage.Sets/src/mage/cards/c/CurseOfTheForsaken.java
index 2759845d26..f240a0e5d6 100644
--- a/Mage.Sets/src/mage/cards/c/CurseOfTheForsaken.java
+++ b/Mage.Sets/src/mage/cards/c/CurseOfTheForsaken.java
@@ -83,8 +83,7 @@ class CurseOfTheForsakenTriggeredAbility extends TriggeredAbilityImpl {
         if (defender != null) {
             Permanent enchantment = game.getPermanent(this.getSourceId());
             if (enchantment != null
-                    && enchantment.getAttachedTo() != null
-                    && enchantment.getAttachedTo().equals(defender.getId())) {
+                    && enchantment.isAttachedTo(defender.getId())) {
                 for (Effect effect : this.getEffects()) {
                     effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
                 }
diff --git a/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java b/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java
index bfd840ef5a..9f713dcde1 100644
--- a/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java
+++ b/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java
@@ -81,7 +81,7 @@ class CurseOfThePiercedHeartAbility extends TriggeredAbilityImpl {
         Permanent enchantment = game.getPermanent(this.sourceId);
         if (enchantment != null && enchantment.getAttachedTo() != null) {
             Player player = game.getPlayer(enchantment.getAttachedTo());
-            if (player != null && game.getActivePlayerId().equals(player.getId())) {
+            if (player != null && game.isActivePlayer(player.getId())) {
                 this.getEffects().get(0).setTargetPointer(new FixedTarget(player.getId()));
                 return true;
             }
diff --git a/Mage.Sets/src/mage/cards/c/CurseOfThirst.java b/Mage.Sets/src/mage/cards/c/CurseOfThirst.java
index a0f2087a3e..97c1c9c1ea 100644
--- a/Mage.Sets/src/mage/cards/c/CurseOfThirst.java
+++ b/Mage.Sets/src/mage/cards/c/CurseOfThirst.java
@@ -81,7 +81,7 @@ class CurseOfThirstAbility extends TriggeredAbilityImpl {
         Permanent enchantment = game.getPermanent(this.sourceId);
         if (enchantment != null && enchantment.getAttachedTo() != null) {
             Player player = game.getPlayer(enchantment.getAttachedTo());
-            if (player != null && game.getActivePlayerId().equals(player.getId())) {
+            if (player != null && game.isActivePlayer(player.getId())) {
                 this.getEffects().get(0).setTargetPointer(new FixedTarget(player.getId()));
                 return true;
             }
diff --git a/Mage.Sets/src/mage/cards/c/CurseOfVengeance.java b/Mage.Sets/src/mage/cards/c/CurseOfVengeance.java
index 0be3bf905d..3fb01a3559 100644
--- a/Mage.Sets/src/mage/cards/c/CurseOfVengeance.java
+++ b/Mage.Sets/src/mage/cards/c/CurseOfVengeance.java
@@ -84,8 +84,7 @@ class CurseOfVengeanceTriggeredAbility extends TriggeredAbilityImpl {
         Spell spell = game.getStack().getSpell(event.getSourceId());
 
         if (enchantment != null && spell != null
-                && enchantment.getAttachedTo() != null
-                && enchantment.getAttachedTo().equals(spell.getControllerId())) {
+                && enchantment.isAttachedTo(spell.getControllerId())) {
             this.getEffects().get(0).setTargetPointer(new FixedTarget(getSourceId()));
             return true;
         }
@@ -126,7 +125,7 @@ class CurseOfVengeancePlayerLosesTriggeredAbility extends TriggeredAbilityImpl {
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
         Permanent sourceObject = game.getPermanentOrLKIBattlefield(this.getSourceId());
-        return sourceObject != null && sourceObject.getAttachedTo().equals(event.getPlayerId());
+        return sourceObject != null && sourceObject.isAttachedTo(event.getPlayerId());
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/d/DawnsReflection.java b/Mage.Sets/src/mage/cards/d/DawnsReflection.java
index 95c1d28040..85b962c872 100644
--- a/Mage.Sets/src/mage/cards/d/DawnsReflection.java
+++ b/Mage.Sets/src/mage/cards/d/DawnsReflection.java
@@ -76,7 +76,7 @@ class DawnsReflectionTriggeredAbility extends TriggeredManaAbility {
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
         Permanent enchantment = game.getPermanent(this.getSourceId());
-        return enchantment != null && event.getSourceId().equals(enchantment.getAttachedTo());
+        return enchantment != null && enchantment.isAttachedTo(event.getSourceId());
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/d/DosanTheFallingLeaf.java b/Mage.Sets/src/mage/cards/d/DosanTheFallingLeaf.java
index ab35abb523..b8e535ff8e 100644
--- a/Mage.Sets/src/mage/cards/d/DosanTheFallingLeaf.java
+++ b/Mage.Sets/src/mage/cards/d/DosanTheFallingLeaf.java
@@ -54,7 +54,7 @@ class DosanTheFallingLeafEffect extends ContinuousRuleModifyingEffectImpl {
 
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        return event.getType() == GameEvent.EventType.CAST_SPELL && !game.getActivePlayerId().equals(event.getPlayerId());
+        return event.getType() == GameEvent.EventType.CAST_SPELL && !game.isActivePlayer(event.getPlayerId());
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/d/DragonlordDromoka.java b/Mage.Sets/src/mage/cards/d/DragonlordDromoka.java
index a33d28d65b..c24d6985bc 100644
--- a/Mage.Sets/src/mage/cards/d/DragonlordDromoka.java
+++ b/Mage.Sets/src/mage/cards/d/DragonlordDromoka.java
@@ -78,7 +78,7 @@ class DragonlordDromokaEffect extends ContinuousRuleModifyingEffectImpl {
 
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (game.getActivePlayerId().equals(source.getControllerId()) &&
+        if (game.isActivePlayer(source.getControllerId()) &&
                 game.getPlayer(source.getControllerId()).hasOpponent(event.getPlayerId(), game)) {
             return true;
         }
diff --git a/Mage.Sets/src/mage/cards/e/EdificeOfAuthority.java b/Mage.Sets/src/mage/cards/e/EdificeOfAuthority.java
index 27b95e5d19..9ee96ef783 100644
--- a/Mage.Sets/src/mage/cards/e/EdificeOfAuthority.java
+++ b/Mage.Sets/src/mage/cards/e/EdificeOfAuthority.java
@@ -117,7 +117,7 @@ class EdificeOfAuthorityRestrictionEffect extends RestrictionEffect {
     public boolean isInactive(Ability source, Game game) {
         if (game.getPhase().getStep().getType() == PhaseStep.UNTAP
                 && game.getStep().getStepPart() == Step.StepPart.PRE) {
-            if (game.getActivePlayerId().equals(source.getControllerId())
+            if (game.isActivePlayer(source.getControllerId())
                     || game.getPlayer(source.getControllerId()).hasReachedNextTurnAfterLeaving()) {
                 for (UUID targetId : this.getTargetPointer().getTargets(game, source)) {
                     Permanent permanent = game.getPermanent(targetId);
diff --git a/Mage.Sets/src/mage/cards/e/EnterTheInfinite.java b/Mage.Sets/src/mage/cards/e/EnterTheInfinite.java
index 536676ee66..5b725d6d0a 100644
--- a/Mage.Sets/src/mage/cards/e/EnterTheInfinite.java
+++ b/Mage.Sets/src/mage/cards/e/EnterTheInfinite.java
@@ -123,7 +123,7 @@ class MaximumHandSizeEffect extends MaximumHandSizeControllerEffect {
     @Override
     public boolean isInactive(Ability source, Game game) {
         if (game.getPhase().getStep().getType() == PhaseStep.UNTAP && game.getStep().getStepPart() == Step.StepPart.PRE) {
-            if (game.getActivePlayerId().equals(source.getControllerId())) {
+            if (game.isActivePlayer(source.getControllerId())) {
                 return true;
             }
         }
diff --git a/Mage.Sets/src/mage/cards/f/FaithsFetters.java b/Mage.Sets/src/mage/cards/f/FaithsFetters.java
index d5fd0ecc6e..42327c282a 100644
--- a/Mage.Sets/src/mage/cards/f/FaithsFetters.java
+++ b/Mage.Sets/src/mage/cards/f/FaithsFetters.java
@@ -86,7 +86,7 @@ class FaithsFettersEffect extends ContinuousRuleModifyingEffectImpl {
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
         Permanent enchantment = game.getPermanent(source.getSourceId());
-        if (enchantment != null && enchantment.getAttachedTo().equals(event.getSourceId())) {
+        if (enchantment != null && enchantment.isAttachedTo(event.getSourceId())) {
             Optional<Ability> ability = game.getAbility(event.getTargetId(), event.getSourceId());
             if (ability.isPresent() && ability.get().getAbilityType() != AbilityType.MANA) {
                 return true;
diff --git a/Mage.Sets/src/mage/cards/f/FinestHour.java b/Mage.Sets/src/mage/cards/f/FinestHour.java
index 87b8adea5e..2163788f4b 100644
--- a/Mage.Sets/src/mage/cards/f/FinestHour.java
+++ b/Mage.Sets/src/mage/cards/f/FinestHour.java
@@ -74,7 +74,7 @@ class FinestHourAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (game.getActivePlayerId().equals(this.controllerId)) {
+        if (game.isActivePlayer(this.controllerId)) {
             if (game.getCombat().attacksAlone()) {
                 for (Effect effect: this.getEffects()) {
                     effect.setTargetPointer(new FixedTarget(game.getCombat().getAttackers().get(0)));
diff --git a/Mage.Sets/src/mage/cards/g/GabrielAngelfire.java b/Mage.Sets/src/mage/cards/g/GabrielAngelfire.java
index 83a1c2357b..a820735811 100644
--- a/Mage.Sets/src/mage/cards/g/GabrielAngelfire.java
+++ b/Mage.Sets/src/mage/cards/g/GabrielAngelfire.java
@@ -77,7 +77,7 @@ class GabrielAngelfireGainAbilityEffect extends GainAbilitySourceEffect {
     @Override
     public boolean isInactive(Ability source, Game game) {
         if (game.getPhase().getStep().getType() == PhaseStep.UPKEEP) {
-            if (!sameStep && game.getActivePlayerId().equals(source.getControllerId()) || game.getPlayer(source.getControllerId()).hasReachedNextTurnAfterLeaving()) {
+            if (!sameStep && game.isActivePlayer(source.getControllerId()) || game.getPlayer(source.getControllerId()).hasReachedNextTurnAfterLeaving()) {
                 return true;
             }
         } else {
diff --git a/Mage.Sets/src/mage/cards/g/GideonBattleForged.java b/Mage.Sets/src/mage/cards/g/GideonBattleForged.java
index 9971f9973d..9507206424 100644
--- a/Mage.Sets/src/mage/cards/g/GideonBattleForged.java
+++ b/Mage.Sets/src/mage/cards/g/GideonBattleForged.java
@@ -138,7 +138,7 @@ class GideonBattleForgedAttacksIfAbleTargetEffect extends RequirementEffect {
         if (targetPermanent == null) {
             return true;
         }
-        if (nextTurnTargetController == 0 && startingTurn != game.getTurnNum() && game.getActivePlayerId().equals(targetPermanent.getControllerId())) {
+        if (nextTurnTargetController == 0 && startingTurn != game.getTurnNum() && game.isActivePlayer(targetPermanent.getControllerId())) {
             nextTurnTargetController = game.getTurnNum();
         }
         return game.getPhase().getType() == TurnPhase.END && nextTurnTargetController > 0 && game.getTurnNum() > nextTurnTargetController;
@@ -157,7 +157,7 @@ class GideonBattleForgedAttacksIfAbleTargetEffect extends RequirementEffect {
     @Override
     public boolean applies(Permanent permanent, Ability source, Game game) {
         if (permanent.getId().equals(getTargetPointer().getFirst(game, source))) {
-            if (game.getActivePlayerId().equals(permanent.getControllerId())) {
+            if (game.isActivePlayer(permanent.getControllerId())) {
                 Permanent planeswalker = game.getPermanent(source.getSourceId());
                 if (planeswalker != null) {
                     return true;
diff --git a/Mage.Sets/src/mage/cards/g/GideonJura.java b/Mage.Sets/src/mage/cards/g/GideonJura.java
index 2edb2813cb..d4890e3114 100644
--- a/Mage.Sets/src/mage/cards/g/GideonJura.java
+++ b/Mage.Sets/src/mage/cards/g/GideonJura.java
@@ -129,7 +129,7 @@ class GideonJuraEffect extends RequirementEffect {
     public boolean isInactive(Ability source, Game game) {
         return (startingTurn != game.getTurnNum()
                 && (game.getPhase().getType() == TurnPhase.END
-                && game.getActivePlayerId().equals(source.getFirstTarget())))
+                && game.isActivePlayer(source.getFirstTarget())))
                 || // 6/15/2010: If a creature controlled by the affected player can't attack Gideon Jura (because he's no longer on the battlefield, for example), that player may have it attack you, another one of your planeswalkers, or nothing at all.
                 creatingPermanent.getPermanent(game) == null;
     }
diff --git a/Mage.Sets/src/mage/cards/g/GisaAndGeralf.java b/Mage.Sets/src/mage/cards/g/GisaAndGeralf.java
index c88f1150fe..66e7d23cbd 100644
--- a/Mage.Sets/src/mage/cards/g/GisaAndGeralf.java
+++ b/Mage.Sets/src/mage/cards/g/GisaAndGeralf.java
@@ -81,7 +81,7 @@ class GisaAndGeralfContinuousEffect extends ContinuousEffectImpl {
     public boolean apply(Game game, Ability source) {
         Player player = game.getPlayer(source.getControllerId());
         if (player != null) {
-            if (!game.getActivePlayerId().equals(player.getId())) {
+            if (!game.isActivePlayer(player.getId())) {
                 return false;
             }
             for (Card card : player.getGraveyard().getCards(filter, game)) {
diff --git a/Mage.Sets/src/mage/cards/g/GrandAbolisher.java b/Mage.Sets/src/mage/cards/g/GrandAbolisher.java
index 2f557aaace..e9c05daf96 100644
--- a/Mage.Sets/src/mage/cards/g/GrandAbolisher.java
+++ b/Mage.Sets/src/mage/cards/g/GrandAbolisher.java
@@ -85,7 +85,7 @@ class GrandAbolisherEffect extends ContinuousRuleModifyingEffectImpl {
 
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (game.getActivePlayerId().equals(source.getControllerId()) && game.getOpponents(source.getControllerId()).contains(event.getPlayerId())) {
+        if (game.isActivePlayer(source.getControllerId()) && game.getOpponents(source.getControllerId()).contains(event.getPlayerId())) {
             switch(event.getType()) {
                 case CAST_SPELL:
                     return true;
diff --git a/Mage.Sets/src/mage/cards/g/GrinningTotem.java b/Mage.Sets/src/mage/cards/g/GrinningTotem.java
index 910bc9034a..b2fa96eebf 100644
--- a/Mage.Sets/src/mage/cards/g/GrinningTotem.java
+++ b/Mage.Sets/src/mage/cards/g/GrinningTotem.java
@@ -124,7 +124,7 @@ class GrinningTotemMayPlayEffect extends AsThoughEffectImpl {
     @Override
     public boolean isInactive(Ability source, Game game) {
         if (game.getPhase().getStep().getType() == PhaseStep.UPKEEP) {
-            if (!sameStep && game.getActivePlayerId().equals(source.getControllerId()) || game.getPlayer(source.getControllerId()).hasReachedNextTurnAfterLeaving()) {
+            if (!sameStep && game.isActivePlayer(source.getControllerId()) || game.getPlayer(source.getControllerId()).hasReachedNextTurnAfterLeaving()) {
                 return true;
             }
         } else {
@@ -178,7 +178,7 @@ class GrinningTotemDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        return game.getActivePlayerId().equals(this.getControllerId());
+        return game.isActivePlayer(this.getControllerId());
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/h/HakimLoreweaver.java b/Mage.Sets/src/mage/cards/h/HakimLoreweaver.java
index 4b17ac32df..ef9f925de7 100644
--- a/Mage.Sets/src/mage/cards/h/HakimLoreweaver.java
+++ b/Mage.Sets/src/mage/cards/h/HakimLoreweaver.java
@@ -145,7 +145,7 @@ class HakimLoreweaverCondition implements Condition {
                 }
             }
             return PhaseStep.UPKEEP == game.getStep().getType()
-                    && game.getActivePlayerId().equals(source.getControllerId());
+                    && game.isActivePlayer(source.getControllerId());
         }
         return false;
     }
diff --git a/Mage.Sets/src/mage/cards/i/IcefallRegent.java b/Mage.Sets/src/mage/cards/i/IcefallRegent.java
index 8243899a55..8e21b7bf10 100644
--- a/Mage.Sets/src/mage/cards/i/IcefallRegent.java
+++ b/Mage.Sets/src/mage/cards/i/IcefallRegent.java
@@ -132,7 +132,7 @@ class IcefallRegentEffect extends ContinuousRuleModifyingEffectImpl {
         if (game.getTurn().getStepType() == PhaseStep.UNTAP && event.getType() == GameEvent.EventType.UNTAP) {
             if (event.getTargetId().equals(targetPointer.getFirst(game, source))) {
                 Permanent targetCreature = game.getPermanent(targetPointer.getFirst(game, source));
-                return targetCreature != null && game.getActivePlayerId().equals(targetCreature.getControllerId());
+                return targetCreature != null && game.isActivePlayer(targetCreature.getControllerId());
             }
         }
 
diff --git a/Mage.Sets/src/mage/cards/i/IllusionistsBracers.java b/Mage.Sets/src/mage/cards/i/IllusionistsBracers.java
index 8e73dee5b4..389d705645 100644
--- a/Mage.Sets/src/mage/cards/i/IllusionistsBracers.java
+++ b/Mage.Sets/src/mage/cards/i/IllusionistsBracers.java
@@ -72,7 +72,7 @@ class AbilityActivatedTriggeredAbility extends TriggeredAbilityImpl {
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
         Permanent equipment = game.getPermanent(this.getSourceId());
-        if (equipment != null && equipment.getAttachedTo() != null && equipment.getAttachedTo().equals(event.getSourceId())) {
+        if (equipment != null  && equipment.isAttachedTo(event.getSourceId())) {
             StackAbility stackAbility = (StackAbility) game.getStack().getStackObject(event.getSourceId());
             if (!(stackAbility.getStackAbility() instanceof ActivatedManaAbilityImpl)) {
                 Effect effect = this.getEffects().get(0);
diff --git a/Mage.Sets/src/mage/cards/i/InfectiousCurse.java b/Mage.Sets/src/mage/cards/i/InfectiousCurse.java
index 24418136a1..555dc866bd 100644
--- a/Mage.Sets/src/mage/cards/i/InfectiousCurse.java
+++ b/Mage.Sets/src/mage/cards/i/InfectiousCurse.java
@@ -87,7 +87,7 @@ class InfectiousCurseAbility extends TriggeredAbilityImpl {
         Permanent enchantment = game.getPermanent(this.sourceId);
         if (enchantment != null && enchantment.getAttachedTo() != null) {
             Player player = game.getPlayer(enchantment.getAttachedTo());
-            if (player != null && game.getActivePlayerId().equals(player.getId())) {
+            if (player != null && game.isActivePlayer(player.getId())) {
                 this.getEffects().get(0).setTargetPointer(new FixedTarget(player.getId()));
                 return true;
             }
diff --git a/Mage.Sets/src/mage/cards/j/JaceArchitectOfThought.java b/Mage.Sets/src/mage/cards/j/JaceArchitectOfThought.java
index ecd7273c35..efd444476f 100644
--- a/Mage.Sets/src/mage/cards/j/JaceArchitectOfThought.java
+++ b/Mage.Sets/src/mage/cards/j/JaceArchitectOfThought.java
@@ -134,7 +134,7 @@ class JaceArchitectOfThoughtDelayedTriggeredAbility extends DelayedTriggeredAbil
 
     @Override
     public boolean isInactive(Game game) {
-        return game.getActivePlayerId().equals(getControllerId()) && game.getTurnNum() != startingTurn;
+        return game.isActivePlayer(getControllerId()) && game.getTurnNum() != startingTurn;
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/k/KaradorGhostChieftain.java b/Mage.Sets/src/mage/cards/k/KaradorGhostChieftain.java
index 35b7d59bc5..aba7458be3 100644
--- a/Mage.Sets/src/mage/cards/k/KaradorGhostChieftain.java
+++ b/Mage.Sets/src/mage/cards/k/KaradorGhostChieftain.java
@@ -111,7 +111,7 @@ class KaradorGhostChieftainContinuousEffect extends ContinuousEffectImpl {
     public boolean apply(Game game, Ability source) {
         Player player = game.getPlayer(source.getControllerId());
         if (player != null) {
-            if (game.getActivePlayerId() == null || !game.getActivePlayerId().equals(player.getId())) {
+            if (game.getActivePlayerId() == null || !game.isActivePlayer(player.getId())) {
                 return false;
             }
             for (Card card : player.getGraveyard().getCards(new FilterCreatureCard(), game)) {
diff --git a/Mage.Sets/src/mage/cards/k/KeranosGodOfStorms.java b/Mage.Sets/src/mage/cards/k/KeranosGodOfStorms.java
index 2713e4282d..3590d94123 100644
--- a/Mage.Sets/src/mage/cards/k/KeranosGodOfStorms.java
+++ b/Mage.Sets/src/mage/cards/k/KeranosGodOfStorms.java
@@ -92,7 +92,7 @@ class KeranosGodOfStormsTriggeredAbility extends TriggeredAbilityImpl {
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
         if (event.getPlayerId().equals(this.getControllerId())) {
-            if (game.getActivePlayerId().equals(this.getControllerId())) {
+            if (game.isActivePlayer(this.getControllerId())) {
                 CardsAmountDrawnThisTurnWatcher watcher =
                         (CardsAmountDrawnThisTurnWatcher) game.getState().getWatchers().get(CardsAmountDrawnThisTurnWatcher.class.getSimpleName());
                 if (watcher != null && watcher.getAmountCardsDrawn(event.getPlayerId()) != 1) {
diff --git a/Mage.Sets/src/mage/cards/k/KessDissidentMage.java b/Mage.Sets/src/mage/cards/k/KessDissidentMage.java
index 8eb49369f9..bc3cc94473 100644
--- a/Mage.Sets/src/mage/cards/k/KessDissidentMage.java
+++ b/Mage.Sets/src/mage/cards/k/KessDissidentMage.java
@@ -97,7 +97,7 @@ class KessDissidentMageContinuousEffect extends ContinuousEffectImpl {
     public boolean apply(Game game, Ability source) {
         Player player = game.getPlayer(source.getControllerId());
         if (player != null) {
-            if (!game.getActivePlayerId().equals(player.getId())) {
+            if (!game.isActivePlayer(player.getId())) {
                 return false;
             }
             for (Card card : player.getGraveyard().getCards(filter, game)) {
@@ -138,7 +138,7 @@ class KessDissidentMageCastFromGraveyardEffect extends AsThoughEffectImpl {
     public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) {
         if (objectId.equals(getTargetPointer().getFirst(game, source))) {
             if (affectedControllerId.equals(source.getControllerId())) {
-                if (game.getActivePlayerId().equals(source.getControllerId())) {
+                if (game.isActivePlayer(source.getControllerId())) {
                     KessDissidentMageWatcher watcher = (KessDissidentMageWatcher) game.getState().getWatchers().get(KessDissidentMageWatcher.class.getSimpleName(), source.getSourceId());
                     if (!(source instanceof FlashbackAbility)) {
                         return !watcher.isAbilityUsed();
diff --git a/Mage.Sets/src/mage/cards/k/KumanosBlessing.java b/Mage.Sets/src/mage/cards/k/KumanosBlessing.java
index c6873c3cf9..c745c6fd9c 100644
--- a/Mage.Sets/src/mage/cards/k/KumanosBlessing.java
+++ b/Mage.Sets/src/mage/cards/k/KumanosBlessing.java
@@ -1,9 +1,6 @@
 
 package mage.cards.k;
 
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
 import mage.MageObjectReference;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
@@ -24,15 +21,18 @@ import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 import mage.watchers.Watcher;
 
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+
 
 /**
- *
  * @author LevelX2
  */
 public final class KumanosBlessing extends CardImpl {
 
     public KumanosBlessing(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}");
         this.subtype.add(SubType.AURA);
 
         // Flash
@@ -77,7 +77,7 @@ class KumanosBlessingEffect extends ReplacementEffectImpl {
 
     @Override
     public boolean replaceEvent(GameEvent event, Ability source, Game game) {
-        Permanent permanent = ((ZoneChangeEvent)event).getTarget();
+        Permanent permanent = ((ZoneChangeEvent) event).getTarget();
         Player controller = game.getPlayer(source.getControllerId());
         if (controller != null && permanent != null) {
             return controller.moveCardToExileWithInfo(permanent, null, null, source.getSourceId(), game, Zone.BATTLEFIELD, true);
@@ -89,10 +89,10 @@ class KumanosBlessingEffect extends ReplacementEffectImpl {
     public boolean checksEventType(GameEvent event, Game game) {
         return event.getType() == EventType.ZONE_CHANGE;
     }
-    
+
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        ZoneChangeEvent  zce = (ZoneChangeEvent) event;
+        ZoneChangeEvent zce = (ZoneChangeEvent) event;
         if (zce.isDiesEvent()) {
             DamagedByEnchantedWatcher watcher = (DamagedByEnchantedWatcher) game.getState().getWatchers().get(DamagedByEnchantedWatcher.class.getSimpleName(), source.getSourceId());
             if (watcher != null) {
@@ -126,16 +126,15 @@ class DamagedByEnchantedWatcher extends Watcher {
     public void watch(GameEvent event, Game game) {
         if (event.getType() == EventType.DAMAGED_CREATURE) {
             Permanent enchantment = game.getPermanent(this.getSourceId());
-            if (enchantment != null && enchantment.getAttachedTo() != null) {
-                if (enchantment.getAttachedTo().equals(event.getSourceId())) {
-                    MageObjectReference mor = new MageObjectReference(event.getTargetId(), game);
-                        damagedCreatures.add(mor);
+            if (enchantment != null && enchantment.isAttachedTo(event.getSourceId())) {
+                MageObjectReference mor = new MageObjectReference(event.getTargetId(), game);
+                damagedCreatures.add(mor);
 
-                }
             }
         }
     }
 
+
     @Override
     public void reset() {
         super.reset();
diff --git a/Mage.Sets/src/mage/cards/m/MarketFestival.java b/Mage.Sets/src/mage/cards/m/MarketFestival.java
index f642113728..b6431fa765 100644
--- a/Mage.Sets/src/mage/cards/m/MarketFestival.java
+++ b/Mage.Sets/src/mage/cards/m/MarketFestival.java
@@ -78,7 +78,7 @@ class MarketFestivalTriggeredAbility extends TriggeredManaAbility {
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
         Permanent enchantment = game.getPermanent(this.getSourceId());
-        return enchantment != null && event.getSourceId().equals(enchantment.getAttachedTo());
+        return enchantment != null && enchantment.isAttachedTo(event.getSourceId());
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/n/NotionThief.java b/Mage.Sets/src/mage/cards/n/NotionThief.java
index 1d790f30eb..9ff6a3977a 100644
--- a/Mage.Sets/src/mage/cards/n/NotionThief.java
+++ b/Mage.Sets/src/mage/cards/n/NotionThief.java
@@ -89,7 +89,7 @@ class NotionThiefReplacementEffect extends ReplacementEffectImpl {
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
         if (game.getOpponents(source.getControllerId()).contains(event.getPlayerId())) {
-            if (game.getActivePlayerId().equals(event.getPlayerId()) && game.getStep().getType() == PhaseStep.DRAW) {
+            if (game.isActivePlayer(event.getPlayerId()) && game.getStep().getType() == PhaseStep.DRAW) {
                 CardsDrawnDuringDrawStepWatcher watcher = (CardsDrawnDuringDrawStepWatcher) game.getState().getWatchers().get(CardsDrawnDuringDrawStepWatcher.class.getSimpleName());
                 if (watcher != null && watcher.getAmountCardsDrawn(event.getPlayerId()) > 0) {
                     return true;
diff --git a/Mage.Sets/src/mage/cards/o/OracleEnVec.java b/Mage.Sets/src/mage/cards/o/OracleEnVec.java
index 4770125d3f..118fd61524 100644
--- a/Mage.Sets/src/mage/cards/o/OracleEnVec.java
+++ b/Mage.Sets/src/mage/cards/o/OracleEnVec.java
@@ -139,7 +139,7 @@ class OracleEnVecMustAttackRequirementEffect extends RequirementEffect {
     public boolean isInactive(Ability source, Game game) {
         return startingTurn != game.getTurnNum()
                 && (game.getPhase().getType() == TurnPhase.END
-                && game.getActivePlayerId().equals(this.getTargetPointer().getFirst(game, source)));
+                && game.isActivePlayer(this.getTargetPointer().getFirst(game, source)));
     }
 
     @Override
@@ -177,7 +177,7 @@ class OracleEnVecCantAttackRestrictionEffect extends RestrictionEffect {
     public boolean isInactive(Ability source, Game game) {
         return startingTurn != game.getTurnNum()
                 && (game.getPhase().getType() == TurnPhase.END
-                && game.getActivePlayerId().equals(this.getTargetPointer().getFirst(game, source)));
+                && game.isActivePlayer(this.getTargetPointer().getFirst(game, source)));
     }
 
     @Override
@@ -207,7 +207,7 @@ class OracleEnVecDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        return startingTurn != game.getTurnNum() && game.getActivePlayerId().equals(event.getPlayerId());
+        return startingTurn != game.getTurnNum() && game.isActivePlayer(event.getPlayerId());
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/o/Overgrowth.java b/Mage.Sets/src/mage/cards/o/Overgrowth.java
index 27718d28c0..39d1741669 100644
--- a/Mage.Sets/src/mage/cards/o/Overgrowth.java
+++ b/Mage.Sets/src/mage/cards/o/Overgrowth.java
@@ -77,7 +77,7 @@ class OvergrowthTriggeredAbility extends TriggeredManaAbility {
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
         Permanent enchantment = game.getPermanent(this.getSourceId());
-        if (enchantment != null && event.getSourceId().equals(enchantment.getAttachedTo())) {
+        if (enchantment != null && enchantment.isAttachedTo(event.getSourceId())) {
             Permanent enchanted = game.getPermanent(enchantment.getAttachedTo());
             if (enchanted != null) {
                 getEffects().get(0).setTargetPointer(new FixedTarget(enchanted.getControllerId()));
diff --git a/Mage.Sets/src/mage/cards/p/ParadoxHaze.java b/Mage.Sets/src/mage/cards/p/ParadoxHaze.java
index 38b926a89f..eb98a98e32 100644
--- a/Mage.Sets/src/mage/cards/p/ParadoxHaze.java
+++ b/Mage.Sets/src/mage/cards/p/ParadoxHaze.java
@@ -79,7 +79,7 @@ class ParadoxHazeTriggeredAbility extends TriggeredAbilityImpl {
         Permanent permanent = game.getPermanent(getSourceId());
         if (permanent != null) {
             Player player = game.getPlayer(permanent.getAttachedTo());
-            if (player != null && game.getActivePlayerId().equals(player.getId())) {
+            if (player != null && game.isActivePlayer(player.getId())) {
                 FirstTimeStepWatcher watcher = (FirstTimeStepWatcher) game.getState().getWatchers().get(EventType.UPKEEP_STEP_POST.toString() + FirstTimeStepWatcher.class.getSimpleName());
                 if (watcher != null && !watcher.conditionMet()) {
                     this.getEffects().get(0).setTargetPointer(new FixedTarget(player.getId()));
diff --git a/Mage.Sets/src/mage/cards/p/PersonalSanctuary.java b/Mage.Sets/src/mage/cards/p/PersonalSanctuary.java
index f6f62c3deb..2a0cdb373b 100644
--- a/Mage.Sets/src/mage/cards/p/PersonalSanctuary.java
+++ b/Mage.Sets/src/mage/cards/p/PersonalSanctuary.java
@@ -68,7 +68,7 @@ class PersonalSanctuaryEffect extends PreventionEffectImpl {
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
         if (event.getType() == GameEvent.EventType.DAMAGE_PLAYER) {
-            if (event.getTargetId().equals(source.getControllerId()) && game.getActivePlayerId().equals(source.getControllerId()))
+            if (event.getTargetId().equals(source.getControllerId()) && game.isActivePlayer(source.getControllerId()))
                 return super.applies(event, source, game);
         }
         return false;
diff --git a/Mage.Sets/src/mage/cards/p/PredatoryAdvantage.java b/Mage.Sets/src/mage/cards/p/PredatoryAdvantage.java
index 551d5a692c..fe202bc1e0 100644
--- a/Mage.Sets/src/mage/cards/p/PredatoryAdvantage.java
+++ b/Mage.Sets/src/mage/cards/p/PredatoryAdvantage.java
@@ -76,7 +76,7 @@ class CastCreatureWatcher extends Watcher {
     @Override
     public void watch(GameEvent event, Game game) {
         if (event.getType() == GameEvent.EventType.SPELL_CAST
-                && game.getActivePlayerId().equals(event.getPlayerId())
+                && game.isActivePlayer(event.getPlayerId())
                 && game.getOpponents(controllerId).contains(event.getPlayerId())) {
             Spell spell = (Spell) game.getObject(event.getTargetId());
             if (spell.isCreature()) {
diff --git a/Mage.Sets/src/mage/cards/p/PrimitiveEtchings.java b/Mage.Sets/src/mage/cards/p/PrimitiveEtchings.java
index addf6310f5..630ceaa9e1 100644
--- a/Mage.Sets/src/mage/cards/p/PrimitiveEtchings.java
+++ b/Mage.Sets/src/mage/cards/p/PrimitiveEtchings.java
@@ -65,7 +65,7 @@ class PrimitiveEtchingsAbility extends TriggeredAbilityImpl {
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
         if (event.getPlayerId().equals(this.getControllerId())) {
-            if (game.getActivePlayerId().equals(this.getControllerId()) && this.lastTriggeredTurn != game.getTurnNum()) {
+            if (game.isActivePlayer(this.getControllerId()) && this.lastTriggeredTurn != game.getTurnNum()) {
                 Card card = game.getCard(event.getTargetId());
                 Player controller = game.getPlayer(this.getControllerId());
                 Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(this.getSourceId());
diff --git a/Mage.Sets/src/mage/cards/r/RafiqOfTheMany.java b/Mage.Sets/src/mage/cards/r/RafiqOfTheMany.java
index c8384d9c94..904e443aa4 100644
--- a/Mage.Sets/src/mage/cards/r/RafiqOfTheMany.java
+++ b/Mage.Sets/src/mage/cards/r/RafiqOfTheMany.java
@@ -77,7 +77,7 @@ class RafiqOfTheManyAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (game.getActivePlayerId().equals(this.controllerId) ) {
+        if (game.isActivePlayer(this.controllerId) ) {
             if (game.getCombat().attacksAlone()) {
                 for (Effect effect: this.getEffects()) {
                     effect.setTargetPointer(new FixedTarget(game.getCombat().getAttackers().get(0)));
diff --git a/Mage.Sets/src/mage/cards/r/RaidBombardment.java b/Mage.Sets/src/mage/cards/r/RaidBombardment.java
index 74a95d90a3..25f1a4d7a1 100644
--- a/Mage.Sets/src/mage/cards/r/RaidBombardment.java
+++ b/Mage.Sets/src/mage/cards/r/RaidBombardment.java
@@ -59,7 +59,7 @@ class RaidBombardmentTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (game.getActivePlayerId().equals(this.controllerId)) {
+        if (game.isActivePlayer(this.controllerId)) {
             Permanent attacker = game.getPermanent(event.getSourceId());
             if (attacker != null) {
                 if (attacker.getPower().getValue() <= 2) {
diff --git a/Mage.Sets/src/mage/cards/r/ReturnToDust.java b/Mage.Sets/src/mage/cards/r/ReturnToDust.java
index 9cdef129d8..c57d35ac04 100644
--- a/Mage.Sets/src/mage/cards/r/ReturnToDust.java
+++ b/Mage.Sets/src/mage/cards/r/ReturnToDust.java
@@ -37,7 +37,7 @@ public final class ReturnToDust extends CardImpl {
     @Override
     public void adjustTargets(Ability ability, Game game) {
         if (ability instanceof SpellAbility) {
-            if (game.getActivePlayerId().equals(ability.getControllerId()) && game.isMainPhase()) {
+            if (game.isActivePlayer(ability.getControllerId()) && game.isMainPhase()) {
                 ability.addTarget(new TargetPermanent(1, 2, StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT, false));
             }
             else {
diff --git a/Mage.Sets/src/mage/cards/r/RowanKenrith.java b/Mage.Sets/src/mage/cards/r/RowanKenrith.java
index 1fc9050119..a3a6678dfd 100644
--- a/Mage.Sets/src/mage/cards/r/RowanKenrith.java
+++ b/Mage.Sets/src/mage/cards/r/RowanKenrith.java
@@ -114,7 +114,7 @@ class RowanKenrithAttackEffect extends RequirementEffect {
     public boolean isInactive(Ability source, Game game) {
         return (startingTurn != game.getTurnNum()
                 && (game.getPhase().getType() == TurnPhase.END
-                && game.getActivePlayerId().equals(source.getFirstTarget())))
+                && game.isActivePlayer(source.getFirstTarget())))
                 || // 6/15/2010: If a creature controlled by the affected player can't attack Gideon Jura (because he's no longer on the battlefield, for example), that player may have it attack you, another one of your planeswalkers, or nothing at all.
                 creatingPermanent.getPermanent(game) == null;
     }
diff --git a/Mage.Sets/src/mage/cards/r/Rowen.java b/Mage.Sets/src/mage/cards/r/Rowen.java
index de7dc8e4fb..c44d050a38 100644
--- a/Mage.Sets/src/mage/cards/r/Rowen.java
+++ b/Mage.Sets/src/mage/cards/r/Rowen.java
@@ -65,7 +65,7 @@ class RowenAbility extends TriggeredAbilityImpl {
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
         if (event.getPlayerId().equals(this.getControllerId())) {
-            if (game.getActivePlayerId().equals(this.getControllerId()) && this.lastTriggeredTurn != game.getTurnNum()) {
+            if (game.isActivePlayer(this.getControllerId()) && this.lastTriggeredTurn != game.getTurnNum()) {
                 Card card = game.getCard(event.getTargetId());
                 Player controller = game.getPlayer(this.getControllerId());
                 Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(this.getSourceId());
diff --git a/Mage.Sets/src/mage/cards/s/SentinelTower.java b/Mage.Sets/src/mage/cards/s/SentinelTower.java
index b9d645b05e..9988c741cc 100644
--- a/Mage.Sets/src/mage/cards/s/SentinelTower.java
+++ b/Mage.Sets/src/mage/cards/s/SentinelTower.java
@@ -61,7 +61,7 @@ class SentinelTowerTriggeredAbility extends SpellCastAllTriggeredAbility {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (game.getActivePlayerId().equals(getControllerId())
+        if (game.isActivePlayer(getControllerId())
                 && super.checkTrigger(event, game)) {
             SentinelTowerWatcher watcher = (SentinelTowerWatcher) game.getState().getWatchers().get(SentinelTowerWatcher.class.getSimpleName());
             if (watcher == null) {
diff --git a/Mage.Sets/src/mage/cards/s/SerraAvenger.java b/Mage.Sets/src/mage/cards/s/SerraAvenger.java
index 065adc24a3..1ddb5e47d2 100644
--- a/Mage.Sets/src/mage/cards/s/SerraAvenger.java
+++ b/Mage.Sets/src/mage/cards/s/SerraAvenger.java
@@ -80,7 +80,7 @@ class CantCastSerraAvengerEffect extends ContinuousRuleModifyingEffectImpl {
         if (event.getType() == EventType.CAST_SPELL && event.getSourceId().equals(source.getSourceId())) {
             Player controller = game.getPlayer(source.getControllerId());
             // it can be cast on other players turn 1 - 3 if some effect let allow you to do this
-            if (controller != null && controller.getTurns() <= 3 && game.getActivePlayerId().equals(source.getControllerId())) {
+            if (controller != null && controller.getTurns() <= 3 && game.isActivePlayer(source.getControllerId())) {
                 return true;
             }
         }
diff --git a/Mage.Sets/src/mage/cards/s/SigilOfValor.java b/Mage.Sets/src/mage/cards/s/SigilOfValor.java
index f7954a8225..aafeddaf20 100644
--- a/Mage.Sets/src/mage/cards/s/SigilOfValor.java
+++ b/Mage.Sets/src/mage/cards/s/SigilOfValor.java
@@ -75,13 +75,12 @@ class SigilOfValorTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (game.getActivePlayerId().equals(getControllerId())) {
+        if (game.isActivePlayer(getControllerId())) {
             if (game.getCombat().attacksAlone()) {
                 Permanent equipment = game.getPermanent(getSourceId());
                 UUID attackerId = game.getCombat().getAttackers().get(0);
                 if (equipment != null
-                        && equipment.getAttachedTo() != null
-                        && equipment.getAttachedTo().equals(attackerId)) {
+                        && equipment.isAttachedTo(attackerId)) {
                     this.getEffects().get(0).setTargetPointer(new FixedTarget(attackerId));
                     return true;
                 }
diff --git a/Mage.Sets/src/mage/cards/s/SirensCall.java b/Mage.Sets/src/mage/cards/s/SirensCall.java
index f075dcc09d..9512ea85e4 100644
--- a/Mage.Sets/src/mage/cards/s/SirensCall.java
+++ b/Mage.Sets/src/mage/cards/s/SirensCall.java
@@ -73,7 +73,7 @@ class SirensCallMustAttackEffect extends RequirementEffect {
 
     @Override
     public boolean applies(Permanent permanent, Ability source, Game game) {
-        return game.getActivePlayerId().equals(permanent.getControllerId());
+        return game.isActivePlayer(permanent.getControllerId());
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/s/SoulEcho.java b/Mage.Sets/src/mage/cards/s/SoulEcho.java
index 7042b2539b..7adefc2cb6 100644
--- a/Mage.Sets/src/mage/cards/s/SoulEcho.java
+++ b/Mage.Sets/src/mage/cards/s/SoulEcho.java
@@ -106,7 +106,7 @@ class SoulEchoReplacementEffect extends ReplacementEffectImpl {
     @Override
     public boolean isInactive(Ability source, Game game) {
         if (game.getPhase().getStep().getType() == PhaseStep.UPKEEP) {
-            if (!sameStep && game.getActivePlayerId().equals(source.getControllerId()) || game.getPlayer(source.getControllerId()).hasReachedNextTurnAfterLeaving()) {
+            if (!sameStep && game.isActivePlayer(source.getControllerId()) || game.getPlayer(source.getControllerId()).hasReachedNextTurnAfterLeaving()) {
                 return true;
             }
         } else {
diff --git a/Mage.Sets/src/mage/cards/s/SovereignsOfLostAlara.java b/Mage.Sets/src/mage/cards/s/SovereignsOfLostAlara.java
index 749155607d..bf9a5c6d90 100644
--- a/Mage.Sets/src/mage/cards/s/SovereignsOfLostAlara.java
+++ b/Mage.Sets/src/mage/cards/s/SovereignsOfLostAlara.java
@@ -77,7 +77,7 @@ class CreatureControlledAttacksAloneTriggeredAbility extends TriggeredAbilityImp
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (game.getActivePlayerId().equals(this.controllerId)) {
+        if (game.isActivePlayer(this.controllerId)) {
             if (game.getCombat().attacksAlone()) {
                 this.getEffects().get(0).setTargetPointer(new FixedTarget(game.getCombat().getAttackers().get(0)));
                 return true;
diff --git a/Mage.Sets/src/mage/cards/s/SphinxsDecree.java b/Mage.Sets/src/mage/cards/s/SphinxsDecree.java
index ec0f5cb46b..2b841942ca 100644
--- a/Mage.Sets/src/mage/cards/s/SphinxsDecree.java
+++ b/Mage.Sets/src/mage/cards/s/SphinxsDecree.java
@@ -103,7 +103,7 @@ class SphinxsDecreeCantCastEffect extends ContinuousRuleModifyingEffectImpl {
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
         UUID opponentId = getTargetPointer().getFirst(game, source);
-        if (game.getActivePlayerId().equals(opponentId)) {
+        if (game.isActivePlayer(opponentId)) {
             if (playersNextTurn == 0) {
                 playersNextTurn = game.getTurnNum();
             }
diff --git a/Mage.Sets/src/mage/cards/s/SpitefulReturned.java b/Mage.Sets/src/mage/cards/s/SpitefulReturned.java
index d0728b5895..3bca683888 100644
--- a/Mage.Sets/src/mage/cards/s/SpitefulReturned.java
+++ b/Mage.Sets/src/mage/cards/s/SpitefulReturned.java
@@ -86,7 +86,7 @@ class SpitefulReturnedTriggeredAbility extends TriggeredAbilityImpl {
                     return true;
                 }
             } else {
-                if (sourcePermanent.getAttachedTo() != null && sourcePermanent.getAttachedTo().equals(event.getSourceId())) {
+                if (sourcePermanent.isAttachedTo(event.getSourceId())) {
                     UUID defender = game.getCombat().getDefendingPlayerId(sourcePermanent.getAttachedTo(), game);
                     this.getEffects().get(0).setTargetPointer(new FixedTarget(defender));
                     return true;
diff --git a/Mage.Sets/src/mage/cards/t/TamiyoFieldResearcher.java b/Mage.Sets/src/mage/cards/t/TamiyoFieldResearcher.java
index f3316cca38..c7d568a392 100644
--- a/Mage.Sets/src/mage/cards/t/TamiyoFieldResearcher.java
+++ b/Mage.Sets/src/mage/cards/t/TamiyoFieldResearcher.java
@@ -150,7 +150,7 @@ class TamiyoFieldResearcherDelayedTriggeredAbility extends DelayedTriggeredAbili
 
     @Override
     public boolean isInactive(Game game) {
-        return game.getActivePlayerId().equals(getControllerId()) && game.getTurnNum() != startingTurn;
+        return game.isActivePlayer(getControllerId()) && game.getTurnNum() != startingTurn;
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/t/Taunt.java b/Mage.Sets/src/mage/cards/t/Taunt.java
index ed2e444429..cff6d3e77c 100644
--- a/Mage.Sets/src/mage/cards/t/Taunt.java
+++ b/Mage.Sets/src/mage/cards/t/Taunt.java
@@ -62,7 +62,7 @@ class TauntEffect extends RequirementEffect {
     public boolean isInactive(Ability source, Game game) {
         return startingTurn != game.getTurnNum() &&
                 (game.getPhase().getType() == TurnPhase.END &&
-                game.getActivePlayerId().equals(this.getTargetPointer().getFirst(game, source)));
+                game.isActivePlayer(this.getTargetPointer().getFirst(game, source)));
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/t/TidebinderMage.java b/Mage.Sets/src/mage/cards/t/TidebinderMage.java
index e2ba1780fd..bc6348a859 100644
--- a/Mage.Sets/src/mage/cards/t/TidebinderMage.java
+++ b/Mage.Sets/src/mage/cards/t/TidebinderMage.java
@@ -118,7 +118,7 @@ class TidebinderMageEffect extends ContinuousRuleModifyingEffectImpl {
         if (game.getTurn().getStepType() == PhaseStep.UNTAP && event.getType() == GameEvent.EventType.UNTAP) {
             if (event.getTargetId().equals(targetPointer.getFirst(game, source))) {
                 Permanent permanent = game.getPermanent(event.getTargetId());
-                if (permanent != null && game.getActivePlayerId().equals(permanent.getControllerId())) {
+                if (permanent != null && game.isActivePlayer(permanent.getControllerId())) {
                     return true;
                 }
             }
diff --git a/Mage.Sets/src/mage/cards/t/TormentOfScarabs.java b/Mage.Sets/src/mage/cards/t/TormentOfScarabs.java
index 4d3fbc6db7..bda573aa8b 100644
--- a/Mage.Sets/src/mage/cards/t/TormentOfScarabs.java
+++ b/Mage.Sets/src/mage/cards/t/TormentOfScarabs.java
@@ -80,7 +80,7 @@ class TormentOfScarabsAbility extends TriggeredAbilityImpl {
     public boolean checkTrigger(GameEvent event, Game game) {
         Permanent enchantment = game.getPermanent(this.getSourceId());
         if (enchantment != null && enchantment.getAttachedTo() != null) {
-            if (game.getActivePlayerId().equals(enchantment.getAttachedTo())) {
+            if (game.isActivePlayer(enchantment.getAttachedTo())) {
                 return true;
             }
         }
diff --git a/Mage.Sets/src/mage/cards/u/UndiscoveredParadise.java b/Mage.Sets/src/mage/cards/u/UndiscoveredParadise.java
index f23896135d..17395c3370 100644
--- a/Mage.Sets/src/mage/cards/u/UndiscoveredParadise.java
+++ b/Mage.Sets/src/mage/cards/u/UndiscoveredParadise.java
@@ -89,7 +89,7 @@ class AtBeginningOfUntapDelayedTriggeredAbility extends DelayedTriggeredAbility
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (game.getActivePlayerId().equals(controllerId)) {
+        if (game.isActivePlayer(controllerId)) {
             return true;
         }
         return false;
diff --git a/Mage.Sets/src/mage/cards/u/UnwindingClock.java b/Mage.Sets/src/mage/cards/u/UnwindingClock.java
index 51f5f1d1b2..4c0b876739 100644
--- a/Mage.Sets/src/mage/cards/u/UnwindingClock.java
+++ b/Mage.Sets/src/mage/cards/u/UnwindingClock.java
@@ -67,7 +67,7 @@ class UnwindingClockEffect extends ContinuousEffectImpl {
             applied = Boolean.FALSE;
         }
         if (!applied && layer == Layer.RulesEffects) {
-            if (!game.getActivePlayerId().equals(source.getControllerId()) && game.getStep().getType() == PhaseStep.UNTAP) {
+            if (!game.isActivePlayer(source.getControllerId()) && game.getStep().getType() == PhaseStep.UNTAP) {
                 game.getState().setValue(source.getSourceId() + "applied", true);
                 for (Permanent artifact : game.getBattlefield().getAllActivePermanents(filter, source.getControllerId(), game)) {
                     boolean untap = true;
diff --git a/Mage.Sets/src/mage/cards/u/UrbanBurgeoning.java b/Mage.Sets/src/mage/cards/u/UrbanBurgeoning.java
index bc55f6d0cb..2b9c1d2c91 100644
--- a/Mage.Sets/src/mage/cards/u/UrbanBurgeoning.java
+++ b/Mage.Sets/src/mage/cards/u/UrbanBurgeoning.java
@@ -82,7 +82,7 @@ class UrbanBurgeoningUntapEffect extends ContinuousEffectImpl {
             applied = Boolean.FALSE;
         }
         if (!applied && layer == Layer.RulesEffects) {
-            if (!game.getActivePlayerId().equals(source.getControllerId()) && game.getStep().getType() == PhaseStep.UNTAP) {
+            if (!game.isActivePlayer(source.getControllerId()) && game.getStep().getType() == PhaseStep.UNTAP) {
                 game.getState().setValue(source.getSourceId() + "applied", true);
                 Permanent land = game.getPermanent(source.getSourceId());
                 boolean untap = true;
diff --git a/Mage.Sets/src/mage/cards/v/VoiceOfResurgence.java b/Mage.Sets/src/mage/cards/v/VoiceOfResurgence.java
index 059572e9e7..309f312024 100644
--- a/Mage.Sets/src/mage/cards/v/VoiceOfResurgence.java
+++ b/Mage.Sets/src/mage/cards/v/VoiceOfResurgence.java
@@ -68,7 +68,7 @@ class VoiceOfResurgenceTriggeredAbility extends TriggeredAbilityImpl {
             Spell spell = game.getStack().getSpell(event.getTargetId());
             if (spell != null
                     && game.getOpponents(super.getControllerId()).contains(spell.getControllerId())
-                    && game.getActivePlayerId().equals(super.getControllerId())) {
+                    && game.isActivePlayer(super.getControllerId())) {
                 return true;
             }
         }
diff --git a/Mage.Sets/src/mage/cards/v/VraskaTheUnseen.java b/Mage.Sets/src/mage/cards/v/VraskaTheUnseen.java
index cc1310933b..7699a25e1e 100644
--- a/Mage.Sets/src/mage/cards/v/VraskaTheUnseen.java
+++ b/Mage.Sets/src/mage/cards/v/VraskaTheUnseen.java
@@ -112,7 +112,7 @@ class VraskaTheUnseenGainAbilityEffect extends ContinuousEffectImpl {
     @Override
     public boolean isInactive(Ability source, Game game) {
         if (startingTurn != 0 && game.getTurnNum() != startingTurn) {
-            if (game.getActivePlayerId().equals(source.getControllerId())) {
+            if (game.isActivePlayer(source.getControllerId())) {
                 return true;
             }
         }
diff --git a/Mage.Sets/src/mage/cards/w/WallOfDust.java b/Mage.Sets/src/mage/cards/w/WallOfDust.java
index a9438e5302..5998d54a4c 100644
--- a/Mage.Sets/src/mage/cards/w/WallOfDust.java
+++ b/Mage.Sets/src/mage/cards/w/WallOfDust.java
@@ -76,7 +76,7 @@ class WallOfDustRestrictionEffect extends RestrictionEffect {
         if (targetPermanent == null) {
             return true;
         }
-        if (nextTurnTargetController == 0 && startingTurn != game.getTurnNum() && game.getActivePlayerId().equals(targetPermanent.getControllerId())) {
+        if (nextTurnTargetController == 0 && startingTurn != game.getTurnNum() && game.isActivePlayer(targetPermanent.getControllerId())) {
             nextTurnTargetController = game.getTurnNum();
         }
         return game.getPhase().getType() == TurnPhase.END && nextTurnTargetController > 0 && game.getTurnNum() > nextTurnTargetController;
@@ -95,7 +95,7 @@ class WallOfDustRestrictionEffect extends RestrictionEffect {
     @Override
     public boolean applies(Permanent permanent, Ability source, Game game) {
         if (permanent.getId().equals(getTargetPointer().getFirst(game, source))) {
-            if (game.getActivePlayerId().equals(permanent.getControllerId())) {
+            if (game.isActivePlayer(permanent.getControllerId())) {
                 return true;
             }
         }
diff --git a/Mage.Sets/src/mage/cards/w/Witchstalker.java b/Mage.Sets/src/mage/cards/w/Witchstalker.java
index 42b10d3ee8..6c8f6fedd7 100644
--- a/Mage.Sets/src/mage/cards/w/Witchstalker.java
+++ b/Mage.Sets/src/mage/cards/w/Witchstalker.java
@@ -78,7 +78,7 @@ class WitchstalkerTriggeredAbility extends TriggeredAbilityImpl {
         return spell != null
                 && filter.match(spell,game)
                 && game.getOpponents(this.getControllerId()).contains(spell.getControllerId())
-                && game.getActivePlayerId().equals(this.getControllerId());
+                && game.isActivePlayer(this.getControllerId());
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/w/WritOfPassage.java b/Mage.Sets/src/mage/cards/w/WritOfPassage.java
index b2f3a78725..a36d8348ea 100644
--- a/Mage.Sets/src/mage/cards/w/WritOfPassage.java
+++ b/Mage.Sets/src/mage/cards/w/WritOfPassage.java
@@ -97,7 +97,6 @@ class WritOfPassageAttachedEffect extends RestrictionEffect {
     @Override
     public boolean applies(Permanent permanent, Ability source, Game game) {
         Permanent attachment = game.getPermanent(source.getSourceId());
-        return attachment != null && attachment.getAttachedTo() != null
-                && attachment.getAttachedTo().equals(permanent.getId());
+        return attachment != null   && attachment.isAttachedTo(permanent.getId());
     }
 }
diff --git a/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java b/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java
index 2b0cbb1387..33d6e8756f 100644
--- a/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java
+++ b/Mage.Sets/src/mage/cards/x/XenicPoltergeist.java
@@ -84,7 +84,7 @@ class XenicPoltergeistEffect extends ContinuousEffectImpl {
     @Override
     public boolean isInactive(Ability source, Game game) {
         if (game.getPhase().getStep().getType() == PhaseStep.UPKEEP) {
-            if (game.getActivePlayerId().equals(source.getControllerId())) {
+            if (game.isActivePlayer(source.getControllerId())) {
                 return true;
             }
         }
diff --git a/Mage/src/main/java/mage/abilities/common/DealsDamageToACreatureAttachedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealsDamageToACreatureAttachedTriggeredAbility.java
index 5cf8d73b16..10a3024d06 100644
--- a/Mage/src/main/java/mage/abilities/common/DealsDamageToACreatureAttachedTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/DealsDamageToACreatureAttachedTriggeredAbility.java
@@ -48,8 +48,7 @@ public class DealsDamageToACreatureAttachedTriggeredAbility extends TriggeredAbi
         if (!combatOnly || ((DamagedCreatureEvent) event).isCombatDamage()) {
             Permanent attachment = game.getPermanent(this.getSourceId());
             if (attachment != null
-                    && attachment.getAttachedTo() != null
-                    && event.getSourceId().equals(attachment.getAttachedTo())) {
+                    && attachment.isAttachedTo(event.getSourceId())) {
                 if (setTargetPointer) {
                     for (Effect effect : this.getEffects()) {
                         effect.setTargetPointer(new FixedTarget(event.getTargetId()));
diff --git a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedAttachedEffect.java
index 39647dd438..6fc49b43cd 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedAttachedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/combat/CantBeBlockedAttachedEffect.java
@@ -36,7 +36,7 @@ public class CantBeBlockedAttachedEffect extends RestrictionEffect {
     @Override
     public boolean applies(Permanent permanent, Ability source, Game game) {
         Permanent attachment = game.getPermanent(source.getSourceId());
-        return attachment != null && attachment.getAttachedTo() != null
-                && attachment.getAttachedTo().equals(permanent.getId());
+        return attachment != null
+                && attachment.isAttachedTo(permanent.getId());
     }
 }
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/CantCastMoreThanOneSpellEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/CantCastMoreThanOneSpellEffect.java
index 5a50943bff..e20ec58717 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/CantCastMoreThanOneSpellEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/CantCastMoreThanOneSpellEffect.java
@@ -65,7 +65,7 @@ public class CantCastMoreThanOneSpellEffect extends ContinuousRuleModifyingEffec
                 break;
             case CONTROLLER_ATTACHED_TO:
                 Permanent attachment = game.getPermanent(source.getSourceId());
-                if (attachment == null || !attachment.getAttachedTo().equals(event.getPlayerId())) {
+                if (attachment == null || !attachment.isAttachedTo(event.getPlayerId())) {
                     return false;
                 }
         }
diff --git a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java
index bb11ca0f8f..fca0516e4d 100644
--- a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java
+++ b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java
@@ -630,11 +630,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
 
     @Override
     public List<UUID> getConnectedCards(String key) {
-        if (this.connectedCards.containsKey(key)) {
-            return this.connectedCards.get(key);
-        } else {
-            return emptyList;
-        }
+        return this.connectedCards.getOrDefault(key, emptyList);
     }
 
     @Override