From 5e8aa0036edd664c735a7229277f489a173c56c5 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Mon, 1 Aug 2011 20:01:44 +0400
Subject: [PATCH] Hurray! Fixed Issue 61. This also fixes card copies not
 working (e.g. Basilisk Collar copied several times with Prototype Portal).

---
 Mage/src/mage/abilities/Abilities.java              | 5 +++++
 Mage/src/mage/abilities/AbilitiesImpl.java          | 7 +++++++
 Mage/src/mage/abilities/AbilityImpl.java            | 1 +
 Mage/src/mage/abilities/effects/Effect.java         | 1 +
 Mage/src/mage/abilities/effects/EffectImpl.java     | 5 +++++
 Mage/src/mage/abilities/effects/Effects.java        | 6 ++++++
 Mage/src/mage/cards/CardImpl.java                   | 1 +
 Mage/src/mage/util/functions/CopyFunction.java      | 5 ++++-
 Mage/src/mage/util/functions/CopyTokenFunction.java | 1 +
 9 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/Mage/src/mage/abilities/Abilities.java b/Mage/src/mage/abilities/Abilities.java
index eeaa751359b..40488a46152 100644
--- a/Mage/src/mage/abilities/Abilities.java
+++ b/Mage/src/mage/abilities/Abilities.java
@@ -183,6 +183,11 @@ public interface Abilities<T extends Ability> extends List<T>, Serializable {
 	 * @see mage.cards.CardImpl#assignNewId()
 	 */
 	public void setSourceId(UUID sourceId);
+
+	/**
+	 * Assigns a new {@link java.util.UUID}
+	 */
+	public void newId();
 	
 	/**
 	 * Searches this set of abilities to see if the ability represented by the abilityId
diff --git a/Mage/src/mage/abilities/AbilitiesImpl.java b/Mage/src/mage/abilities/AbilitiesImpl.java
index e63ac8d181f..4e3d47f6677 100644
--- a/Mage/src/mage/abilities/AbilitiesImpl.java
+++ b/Mage/src/mage/abilities/AbilitiesImpl.java
@@ -177,6 +177,13 @@ public class AbilitiesImpl<T extends Ability> extends ArrayList<T> implements Ab
 		}
 	}
 
+	@Override
+	public void newId() {
+		for (Ability ability: this) {
+			ability.newId();
+		}
+	}
+
 	@Override
 	public boolean contains(T ability) {
 		for (T test: this) {
diff --git a/Mage/src/mage/abilities/AbilityImpl.java b/Mage/src/mage/abilities/AbilityImpl.java
index 7da8d31819c..f62619ec0fb 100644
--- a/Mage/src/mage/abilities/AbilityImpl.java
+++ b/Mage/src/mage/abilities/AbilityImpl.java
@@ -121,6 +121,7 @@ public abstract class AbilityImpl<T extends AbilityImpl<T>> implements Ability {
 	@Override
 	public void newId() {
 		this.id = UUID.randomUUID();
+		getEffects().newId();
 	}
 
 	@Override
diff --git a/Mage/src/mage/abilities/effects/Effect.java b/Mage/src/mage/abilities/effects/Effect.java
index 5faebb5e29a..b3ad0bda784 100644
--- a/Mage/src/mage/abilities/effects/Effect.java
+++ b/Mage/src/mage/abilities/effects/Effect.java
@@ -44,6 +44,7 @@ import mage.target.targetpointer.TargetPointer;
 public interface Effect<T extends Effect<T>> extends Serializable {
 
 	public UUID getId();
+	public void newId();
 	public String getText(Mode mode);
 	public boolean apply(Game game, Ability source);
 	public Outcome getOutcome();
diff --git a/Mage/src/mage/abilities/effects/EffectImpl.java b/Mage/src/mage/abilities/effects/EffectImpl.java
index 7a39d61b909..7916351123c 100644
--- a/Mage/src/mage/abilities/effects/EffectImpl.java
+++ b/Mage/src/mage/abilities/effects/EffectImpl.java
@@ -103,4 +103,9 @@ public abstract class EffectImpl<T extends Effect<T>> implements Effect<T> {
 	public TargetPointer getTargetPointer() {
 		return this.targetPointer;
 	}
+
+	@Override
+	public void newId() {
+		this.id = UUID.randomUUID();
+	}
 }
diff --git a/Mage/src/mage/abilities/effects/Effects.java b/Mage/src/mage/abilities/effects/Effects.java
index 6fa43fff6fa..bad39ef3a72 100644
--- a/Mage/src/mage/abilities/effects/Effects.java
+++ b/Mage/src/mage/abilities/effects/Effects.java
@@ -88,4 +88,10 @@ public class Effects extends ArrayList<Effect> {
 		}
 		return total;
 	}
+
+	public void newId() {
+		for (Effect effect: this) {
+			effect.newId();
+		}
+	}
 }
diff --git a/Mage/src/mage/cards/CardImpl.java b/Mage/src/mage/cards/CardImpl.java
index 874d55f7015..976c422f68e 100644
--- a/Mage/src/mage/cards/CardImpl.java
+++ b/Mage/src/mage/cards/CardImpl.java
@@ -98,6 +98,7 @@ public abstract class CardImpl<T extends CardImpl<T>> extends MageObjectImpl<T>
 	@Override
 	public void assignNewId() {
 		this.objectId = UUID.randomUUID();
+		this.abilities.newId();
 		this.abilities.setSourceId(objectId);
 	}
 
diff --git a/Mage/src/mage/util/functions/CopyFunction.java b/Mage/src/mage/util/functions/CopyFunction.java
index f16ccd11825..d994f11805e 100644
--- a/Mage/src/mage/util/functions/CopyFunction.java
+++ b/Mage/src/mage/util/functions/CopyFunction.java
@@ -69,7 +69,10 @@ public class CopyFunction implements Function<Card, Card> {
 		target.setExpansionSetCode(source.getExpansionSetCode());
 		target.getAbilities().clear();
 
-		for (Ability ability : source.getAbilities()) {
+		for (Ability ability0 : source.getAbilities()) {
+			Ability ability = ability0.copy();
+			ability.newId();
+			ability.setSourceId(target.getId());
 			target.addAbility(ability);
 		}
 
diff --git a/Mage/src/mage/util/functions/CopyTokenFunction.java b/Mage/src/mage/util/functions/CopyTokenFunction.java
index 177b64b2f57..f65345c75a4 100644
--- a/Mage/src/mage/util/functions/CopyTokenFunction.java
+++ b/Mage/src/mage/util/functions/CopyTokenFunction.java
@@ -71,6 +71,7 @@ public class CopyTokenFunction implements Function<Token, Card> {
 
 		for (Ability ability0 : source.getAbilities()) {
 			Ability ability = ability0.copy();
+			ability.newId();
 			ability.setSourceId(target.getId());
 			target.addAbility(ability);
 		}