Revert "Fix a bug that magic number doesn't reset if a card modifier …

…modified it once" (#424)
daviscook477 · Jan 19, 2024 · 0fd1e20 · 0fd1e20
1 parent 4671eb6
commit 0fd1e20
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/...n/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/CardModifierPatches.java b/...n/java/basemod/patches/com/megacrit/cardcrawl/cards/AbstractCard/CardModifierPatches.java
@@ -134,8 +134,10 @@ public static class CardModifierOnApplyPowers
         //modifyBaseMagic
         public static void Prefix(AbstractCard __instance) {
             int magic = (int) CardModifierManager.onModifyBaseMagic(__instance.baseMagicNumber, __instance);
-            __instance.magicNumber = magic;
-            __instance.isMagicNumberModified = magic != __instance.baseMagicNumber;
+            if (magic != __instance.baseMagicNumber) {
+                __instance.magicNumber = magic;
+                __instance.isMagicNumberModified = true;
+            }
         }
 
         //onApplyPowers
@@ -231,8 +233,10 @@ public static class CardModifierCalculateCardDamage
         //modifyBaseMagic
         public static void Prefix(AbstractCard __instance) {
             int magic = (int) CardModifierManager.onModifyBaseMagic(__instance.baseMagicNumber, __instance);
-            __instance.magicNumber = magic;
-            __instance.isMagicNumberModified = magic != __instance.baseMagicNumber;
+            if (magic != __instance.baseMagicNumber) {
+                __instance.magicNumber = magic;
+                __instance.isMagicNumberModified = true;
+            }
         }
 
         //onCalculateCardDamage