From 8addbb81463fe16f3a95e0e52bba09dcb2b406ba Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Wed, 7 Jul 2021 17:52:31 -0400
Subject: [PATCH] [AFR] fixed some incorrect implementations of continuous
 effects

---
 Mage.Sets/src/mage/cards/e/EccentricApprentice.java | 13 ++++++++++++-
 .../src/mage/cards/m/MordenkainensPolymorph.java    | 13 ++++++++++++-
 Mage.Sets/src/mage/cards/w/WerewolfPackLeader.java  | 13 ++++++++++++-
 Mage.Sets/src/mage/cards/w/WildShape.java           | 13 ++++++++++++-
 4 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/e/EccentricApprentice.java b/Mage.Sets/src/mage/cards/e/EccentricApprentice.java
index 79bf35ddfeb..46bffe03974 100644
--- a/Mage.Sets/src/mage/cards/e/EccentricApprentice.java
+++ b/Mage.Sets/src/mage/cards/e/EccentricApprentice.java
@@ -91,7 +91,7 @@ class EccentricApprenticeEffect extends ContinuousEffectImpl {
                 permanent.addAbility(FlyingAbility.getInstance(), source.getSourceId(), game);
                 return true;
             case PTChangingEffects_7:
-                if (sublayer == SubLayer.ModifyPT_7c) {
+                if (sublayer == SubLayer.SetPT_7b) {
                     permanent.getPower().setValue(1);
                     permanent.getToughness().setValue(1);
                     return true;
@@ -104,4 +104,15 @@ class EccentricApprenticeEffect extends ContinuousEffectImpl {
     public boolean apply(Game game, Ability source) {
         return false;
     }
+
+    @Override
+    public boolean hasLayer(Layer layer) {
+        switch (layer) {
+            case TypeChangingEffects_4:
+            case AbilityAddingRemovingEffects_6:
+            case PTChangingEffects_7:
+                return true;
+        }
+        return false;
+    }
 }
diff --git a/Mage.Sets/src/mage/cards/m/MordenkainensPolymorph.java b/Mage.Sets/src/mage/cards/m/MordenkainensPolymorph.java
index 7c87f746552..308a1b1d793 100644
--- a/Mage.Sets/src/mage/cards/m/MordenkainensPolymorph.java
+++ b/Mage.Sets/src/mage/cards/m/MordenkainensPolymorph.java
@@ -68,7 +68,7 @@ class MordenkainensPolymorphEffect extends ContinuousEffectImpl {
                 permanent.addAbility(FlyingAbility.getInstance(), source.getSourceId(), game);
                 return true;
             case PTChangingEffects_7:
-                if (sublayer == SubLayer.ModifyPT_7c) {
+                if (sublayer == SubLayer.SetPT_7b) {
                     permanent.getPower().setValue(4);
                     permanent.getToughness().setValue(4);
                     return true;
@@ -81,4 +81,15 @@ class MordenkainensPolymorphEffect extends ContinuousEffectImpl {
     public boolean apply(Game game, Ability source) {
         return false;
     }
+
+    @Override
+    public boolean hasLayer(Layer layer) {
+        switch (layer) {
+            case TypeChangingEffects_4:
+            case AbilityAddingRemovingEffects_6:
+            case PTChangingEffects_7:
+                return true;
+        }
+        return false;
+    }
 }
diff --git a/Mage.Sets/src/mage/cards/w/WerewolfPackLeader.java b/Mage.Sets/src/mage/cards/w/WerewolfPackLeader.java
index 0234e511ae8..569b75c37e4 100644
--- a/Mage.Sets/src/mage/cards/w/WerewolfPackLeader.java
+++ b/Mage.Sets/src/mage/cards/w/WerewolfPackLeader.java
@@ -77,7 +77,7 @@ class WerewolfPackLeaderEffect extends ContinuousEffectImpl {
                 permanent.addAbility(TrampleAbility.getInstance(), source.getSourceId(), game);
                 return true;
             case PTChangingEffects_7:
-                if (sublayer == SubLayer.ModifyPT_7c) {
+                if (sublayer == SubLayer.SetPT_7b) {
                     permanent.getPower().setValue(5);
                     permanent.getToughness().setValue(3);
                     return true;
@@ -90,4 +90,15 @@ class WerewolfPackLeaderEffect extends ContinuousEffectImpl {
     public boolean apply(Game game, Ability source) {
         return false;
     }
+
+    @Override
+    public boolean hasLayer(Layer layer) {
+        switch (layer) {
+            case TypeChangingEffects_4:
+            case AbilityAddingRemovingEffects_6:
+            case PTChangingEffects_7:
+                return true;
+        }
+        return false;
+    }
 }
diff --git a/Mage.Sets/src/mage/cards/w/WildShape.java b/Mage.Sets/src/mage/cards/w/WildShape.java
index bdd69c812a9..fd11ef1a42b 100644
--- a/Mage.Sets/src/mage/cards/w/WildShape.java
+++ b/Mage.Sets/src/mage/cards/w/WildShape.java
@@ -105,7 +105,7 @@ class WildShapeEffect extends ContinuousEffectImpl {
                 permanent.addAbility(ability, source.getSourceId(), game);
                 return true;
             case PTChangingEffects_7:
-                if (sublayer == SubLayer.ModifyPT_7c) {
+                if (sublayer == SubLayer.SetPT_7b) {
                     permanent.getPower().setValue(power);
                     permanent.getToughness().setValue(toughness);
                     return true;
@@ -118,4 +118,15 @@ class WildShapeEffect extends ContinuousEffectImpl {
     public boolean apply(Game game, Ability source) {
         return false;
     }
+
+    @Override
+    public boolean hasLayer(Layer layer) {
+        switch (layer) {
+            case TypeChangingEffects_4:
+            case AbilityAddingRemovingEffects_6:
+            case PTChangingEffects_7:
+                return true;
+        }
+        return false;
+    }
 }