* Some more fixes for ManaOptions #5023

magefree · Jun 24, 2018 · 99cfd86 · LevelX2 · Jun 24, 2018 · 99cfd86
1 parent 2ec3ebd
commit 99cfd86
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/Mage.Sets/src/mage/cards/n/NykthosShrineToNyx.java b/Mage.Sets/src/mage/cards/n/NykthosShrineToNyx.java
@@ -66,11 +66,11 @@ public NykthosShrineToNyxManaAbility copy() {
 
     @Override
     public List<Mana> getNetMana(Game game) {
-        netMana.clear();
+        ArrayList<Mana> netManaCopy = new ArrayList<>();
         if (game != null) {
-            netMana.addAll(((ManaEffect) this.getEffects().get(0)).getNetMana(game, this));
+            netManaCopy.addAll(((ManaEffect) this.getEffects().get(0)).getNetMana(game, this));
         }
-        return netMana;
+        return netManaCopy;
     }
 }
 

diff --git a/Mage/src/main/java/mage/abilities/mana/CommanderColorIdentityManaAbility.java b/Mage/src/main/java/mage/abilities/mana/CommanderColorIdentityManaAbility.java
@@ -1,6 +1,6 @@
-
 package mage.abilities.mana;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import mage.Mana;
@@ -42,6 +42,7 @@ public CommanderColorIdentityManaAbility copy() {
 
     @Override
     public List<Mana> getNetMana(Game game) {
+        List<Mana> netManas = new ArrayList<>();
         if (netMana.isEmpty() && game != null) {
             Player controller = game.getPlayer(getControllerId());
             if (controller != null) {
@@ -68,7 +69,8 @@ public List<Mana> getNetMana(Game game) {
                 }
             }
         }
-        return netMana;
+        netManas.addAll(netMana);
+        return netManas;
     }
 
     @Override

diff --git a/Mage/src/main/java/mage/abilities/mana/ConditionalManaAbility.java b/Mage/src/main/java/mage/abilities/mana/ConditionalManaAbility.java
@@ -33,8 +33,6 @@ public ConditionalManaAbility copy() {
 
     @Override
     public List<Mana> getNetMana(Game game) {
-        List<Mana> newNetMana = new ArrayList<>();
-        newNetMana.addAll(conditionalManaEffect.getNetMana(game, this));
-        return newNetMana;
+        return new ArrayList<>(conditionalManaEffect.getNetMana(game, this));
     }
 }
diff --git a/Mage/src/main/java/mage/abilities/mana/ManaOptions.java b/Mage/src/main/java/mage/abilities/mana/ManaOptions.java
@@ -53,7 +53,7 @@ public void addMana(List<ActivatedManaAbilityImpl> abilities, Game game) {
                     boolean hasTapCost = hasTapCost(abilities.get(0));
                     for (Mana netMana : netManas) {
                         for (Mana mana : copy) {
-                            if (!hasTapCost || checkTappedForManaReplacement(abilities.get(0), game, netMana)) {
+                            if (!hasTapCost /* || checkTappedForManaReplacement(abilities.get(0), game, netMana) */) { // Seems to produce endless iterations so deactivated for now:  https://github.com/magefree/mage/issues/5023
                                 Mana newMana = new Mana();
                                 newMana.add(mana);
                                 newMana.add(netMana);

diff --git a/Mage/src/main/java/mage/abilities/mana/SimpleManaAbility.java b/Mage/src/main/java/mage/abilities/mana/SimpleManaAbility.java
@@ -1,6 +1,6 @@
-
 package mage.abilities.mana;
 
+import java.util.ArrayList;
 import java.util.List;
 import mage.Mana;
 import mage.abilities.costs.Cost;
@@ -55,7 +55,7 @@ public List<Mana> getNetMana(Game game) {
         if (predictable) {
             return super.getNetMana(game);
         }
-        return netMana;
+        return new ArrayList<Mana>(netMana);
     }
 
 }
diff --git a/Mage/src/main/java/mage/abilities/mana/TriggeredManaAbility.java b/Mage/src/main/java/mage/abilities/mana/TriggeredManaAbility.java
@@ -1,4 +1,3 @@
-
 package mage.abilities.mana;
 
 import java.util.ArrayList;
@@ -54,7 +53,7 @@ public List<Mana> getNetMana(Game game) {
             }
             return newNetMana;
         }
-        return netMana;
+        return new ArrayList<Mana>(netMana);
     }
 
     /**