From 3d42da96d4848b8608e14c5b4b68ad2cd10b81c7 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Thu, 21 Nov 2024 16:10:20 +0800 Subject: [PATCH] add persistentmana check --- .../src/main/java/forge/game/mana/ManaPool.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/mana/ManaPool.java b/forge-game/src/main/java/forge/game/mana/ManaPool.java index 0b923ad4f12..a69079cf21d 100644 --- a/forge-game/src/main/java/forge/game/mana/ManaPool.java +++ b/forge-game/src/main/java/forge/game/mana/ManaPool.java @@ -119,9 +119,16 @@ public class ManaPool extends ManaConversionMatrix implements Iterable { safeMana += getAmountOfColor(c); } - // TODO isPersistentMana + boolean hasPersistentMana = false; + for (Mana m : floatingMana().values()) { + AbilityManaPart mp = m.getManaAbility(); + if (mp != null && mp.isPersistentMana()) { + hasPersistentMana = true; + break; + } + } - return totalMana() != safeMana; //won't lose floating mana if all mana is of colors that aren't going to be emptied + return hasPersistentMana || totalMana() != safeMana; //won't lose floating mana if all mana is of colors that aren't going to be emptied } public final boolean hasBurn() {