Extend original ID concept to apply to effects as well as abilities

The root cause of the issue here is that when a permanent with a
replacement effect is copied, this is applied via a continuous
`CopyEffect`.  Normally this is not a problem, but for attack taxers,
part of choosing whether the replacement effect applies or not is
tapping mana sources, which triggers `applyEffects()` to run.  The
`CopyEffect` is then reapplied, and as part of it, it clears the copied
abilities and generates new ones with new IDs from the blueprint.  Thus,
the loop checking whether all replacement effects have been consumed
never terminates, because it sees a new replacement effect with a new ID
it needs to apply.

This extends the concept of `originalId`, which abilities already have,
to also apply to effects.  It can be used in any scenarios which need an
effect's ID to remain stable even when it is destroyed and recreated via
a copy from a continuous effect.

Fixes #10372

Fixes #14754

Author: matoro

Mage.Tests/src/test/java/org/mage/test/cards/replacement/PropagandaTest.java

@@ -57,4 +57,33 @@ public void test_Propaganda2() {
         assertTappedCount("Plains", true, 4);
     }
 
+    // https://github.com/magefree/mage/issues/10372
+    // https://github.com/magefree/mage/issues/14754
+    @Test
+    public void testClone() {
+        addCard(Zone.BATTLEFIELD, playerB, "Archangel of Tithes");
+        addCard(Zone.HAND, playerA, "Clone");
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 4);
+        addCard(Zone.BATTLEFIELD, playerB, "Balduvian Bears");
+        addCard(Zone.BATTLEFIELD, playerB, "Wastes");
+        addCard(Zone.HAND, playerA, "Fell");
+        addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2);
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Clone");
+        setChoice(playerA, true);
+        setChoice(playerA, "Archangel of Tithes");
+        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Fell");
+        addTarget(playerA, "Archangel of Tithes[no copy]");
+
+        attack(2, playerB, "Balduvian Bears");
+        setChoice(playerB, true);
+
+        setStrictChooseMode(true);
+        setStopAt(2, PhaseStep.POSTCOMBAT_MAIN);
+        execute();
+
+        assertLife(playerA, 18);
+        assertTappedCount("Balduvian Bears", true, 1);
+    }
+
 }

Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java

@@ -855,8 +855,8 @@ public boolean replaceEvent(GameEvent event, Game game) {
             // Remove all consumed effects (ability dependant)
             for (Iterator<ReplacementEffect> it1 = rEffects.keySet().iterator(); it1.hasNext(); ) {
                 ReplacementEffect entry = it1.next();
-                if (consumed.containsKey(entry.getId()) /*&& !(entry instanceof CommanderReplacementEffect) */) { // 903.9.
-                    Set<UUID> consumedAbilitiesIds = consumed.get(entry.getId());
+                if (consumed.containsKey(entry.getOriginalId()) /*&& !(entry instanceof CommanderReplacementEffect) */) { // 903.9.
+                    Set<UUID> consumedAbilitiesIds = consumed.get(entry.getOriginalId());
                     if (rEffects.get(entry) == null || consumedAbilitiesIds.size() == rEffects.get(entry).size()) {
                         it1.remove();
                     } else {
@@ -944,8 +944,8 @@ public boolean replaceEvent(GameEvent event, Game game) {
 
             // add the applied effect to the consumed effects
             if (rEffect != null) {
-                if (consumed.containsKey(rEffect.getId())) {
-                    Set<UUID> set = consumed.get(rEffect.getId());
+                if (consumed.containsKey(rEffect.getOriginalId())) {
+                    Set<UUID> set = consumed.get(rEffect.getOriginalId());
                     if (rAbility != null) {
                         set.add(rAbility.getId());
 
@@ -955,7 +955,7 @@ public boolean replaceEvent(GameEvent event, Game game) {
                     if (rAbility != null) { // in case of AuraReplacementEffect or PlaneswalkerReplacementEffect there is no Ability
                         set.add(rAbility.getId());
                     }
-                    consumed.put(rEffect.getId(), set);
+                    consumed.put(rEffect.getOriginalId(), set);
                 }
             }
             // Must be called here for some effects to be able to work correctly

Mage/src/main/java/mage/abilities/effects/Effect.java

@@ -19,6 +19,8 @@ public interface Effect extends Serializable, Copyable<Effect> {
 
     UUID getId();
 
+    UUID getOriginalId();
+
     void newId();
 
     /**

Mage/src/main/java/mage/abilities/effects/EffectImpl.java

@@ -17,6 +17,7 @@
 public abstract class EffectImpl implements Effect {
 
     protected UUID id;
+    protected UUID originalId;
     protected Outcome outcome;
     protected EffectType effectType;
 
@@ -30,13 +31,15 @@ public abstract class EffectImpl implements Effect {
 
     public EffectImpl(Outcome outcome) {
         this.id = UUID.randomUUID();
+        this.originalId = this.id;
         this.outcome = outcome;
 
         initNewTargetPointer();
     }
 
     protected EffectImpl(final EffectImpl effect) {
         this.id = effect.id;
+        this.originalId = effect.id;
         this.outcome = effect.outcome;
         this.staticText = effect.staticText;
         this.effectType = effect.effectType;
@@ -61,6 +64,11 @@ public UUID getId() {
         return id;
     }
 
+    @Override
+    public UUID getOriginalId() {
+        return originalId;
+    }
+
     @Override
     public String getText(Mode mode) {
         return staticText;