From f3ae9c85a6efd35896f7350c507b4980740a0a13 Mon Sep 17 00:00:00 2001 From: magenoxx Date: Mon, 25 Feb 2013 21:01:48 +0400 Subject: [PATCH] Fixed Issue#146: Creature moving to exile zone instead graveyard --- .../src/mage/sets/gatecrash/AureliasFury.java | 11 ++++++----- Mage.Sets/src/mage/sets/iceage/TinderWall.java | 9 +++++---- .../src/mage/sets/magic2013/FaithsReward.java | 2 +- .../mage/sets/newphyrexia/CathedralMembrane.java | 15 ++++++--------- .../mage/sets/scarsofmirrodin/SteelHellkite.java | 12 ++++++------ .../src/mage/sets/zendikar/ArchmageAscension.java | 10 ++++------ Mage.Sets/src/mage/sets/zendikar/Gomazoa.java | 9 +++++---- .../src/mage/sets/zendikar/RuneflareTrap.java | 4 +++- .../watchers/common/AttackedThisTurnWatcher.java | 2 +- .../mage/watchers/common/DamagedByWatcher.java | 9 +++++---- .../common/PlayerDamagedBySourceWatcher.java | 9 +++++---- .../watchers/common/SourceDidDamageWatcher.java | 9 +++++---- 12 files changed, 52 insertions(+), 49 deletions(-) diff --git a/Mage.Sets/src/mage/sets/gatecrash/AureliasFury.java b/Mage.Sets/src/mage/sets/gatecrash/AureliasFury.java index f2dcd31014..86b5be0410 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AureliasFury.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AureliasFury.java @@ -27,9 +27,6 @@ */ package mage.sets.gatecrash; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.Constants; import mage.Constants.CardType; import mage.Constants.Outcome; @@ -55,6 +52,10 @@ import mage.target.common.TargetCreatureOrPlayerAmount; import mage.target.targetpointer.FixedTarget; import mage.watchers.WatcherImpl; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * GATECRASH FAQ 11.01.2013 * @@ -198,8 +199,8 @@ class AureliasFuryDamagedByWatcher extends WatcherImpl { public BlockedByWatcher(final BlockedByWatcher watcher) { super(watcher); - this.blockedByWatcher = watcher.blockedByWatcher; + this.blockedByWatcher.addAll(watcher.blockedByWatcher); } @Override diff --git a/Mage.Sets/src/mage/sets/magic2013/FaithsReward.java b/Mage.Sets/src/mage/sets/magic2013/FaithsReward.java index bef23ac53f..a1d018c2a6 100644 --- a/Mage.Sets/src/mage/sets/magic2013/FaithsReward.java +++ b/Mage.Sets/src/mage/sets/magic2013/FaithsReward.java @@ -110,7 +110,7 @@ class FaithsRewardWatcher extends WatcherImpl { public FaithsRewardWatcher(final FaithsRewardWatcher watcher) { super(watcher); - this.cards = (ArrayList) watcher.cards.clone(); + this.cards.addAll(watcher.cards); } @Override diff --git a/Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java b/Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java index ef2641dcbe..e86e7868f7 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java @@ -27,15 +27,8 @@ */ package mage.sets.newphyrexia; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.Constants.TurnPhase; -import mage.Constants.WatcherScope; -import mage.Constants.Zone; +import mage.Constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ZoneChangeTriggeredAbility; @@ -47,6 +40,10 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.watchers.WatcherImpl; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author BetaSteward @@ -149,7 +146,7 @@ class CathedralMembraneWatcher extends WatcherImpl { public CathedralMembraneWatcher(final CathedralMembraneWatcher watcher) { super(watcher); - this.blockedCreatures = watcher.blockedCreatures; + this.blockedCreatures.addAll(watcher.blockedCreatures); } @Override diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SteelHellkite.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SteelHellkite.java index 117d55a10d..d7837065ae 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SteelHellkite.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SteelHellkite.java @@ -30,6 +30,7 @@ package mage.sets.scarsofmirrodin; import mage.Constants; import mage.Constants.CardType; import mage.Constants.Rarity; +import mage.Constants.WatcherScope; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateOncePerTurnActivatedAbility; @@ -40,15 +41,16 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; +import mage.filter.common.FilterNonlandPermanent; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.watchers.WatcherImpl; -import java.util.*; -import mage.Constants.WatcherScope; -import mage.filter.common.FilterNonlandPermanent; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; /** * @author nantuko @@ -125,9 +127,7 @@ class SteelHellkiteWatcher extends WatcherImpl { public SteelHellkiteWatcher(final SteelHellkiteWatcher watcher) { super(watcher); - for (UUID playerId: watcher.damagedPlayers) { - damagedPlayers.add(playerId); - } + damagedPlayers.addAll(watcher.damagedPlayers); } @Override diff --git a/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java b/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java index e3556279ae..412abd5e30 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java +++ b/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java @@ -27,13 +27,8 @@ */ package mage.sets.zendikar; -import java.util.UUID; import mage.Constants; -import mage.Constants.CardType; -import mage.Constants.Duration; -import mage.Constants.Outcome; -import mage.Constants.Rarity; -import mage.Constants.WatcherScope; +import mage.Constants.*; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; @@ -50,6 +45,8 @@ import mage.players.Player; import mage.target.common.TargetCardInLibrary; import mage.watchers.WatcherImpl; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -122,6 +119,7 @@ class CardsDrawnControllerWatcher extends WatcherImpl { public BlockedByWatcher(final BlockedByWatcher watcher) { super(watcher); - this.blockedByWatcher = watcher.blockedByWatcher; + this.blockedByWatcher.addAll(watcher.blockedByWatcher); } @Override diff --git a/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java b/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java index 48cf4d368a..6760be5fb3 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java @@ -27,7 +27,6 @@ */ package mage.sets.zendikar; -import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.Constants.WatcherScope; @@ -43,6 +42,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.watchers.WatcherImpl; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -114,6 +115,7 @@ class CardsDrawnOpponentWatcher extends WatcherImpl { public CardsDrawnOpponentWatcher(final CardsDrawnOpponentWatcher watcher) { super(watcher); + this.cardsDrawn = watcher.cardsDrawn; } @Override diff --git a/Mage/src/mage/watchers/common/AttackedThisTurnWatcher.java b/Mage/src/mage/watchers/common/AttackedThisTurnWatcher.java index 04f4ba7d16..dfcbd3425d 100644 --- a/Mage/src/mage/watchers/common/AttackedThisTurnWatcher.java +++ b/Mage/src/mage/watchers/common/AttackedThisTurnWatcher.java @@ -49,7 +49,7 @@ public class AttackedThisTurnWatcher extends WatcherImpl { public DamagedByWatcher(final DamagedByWatcher watcher) { super(watcher); - this.damagedCreatures = watcher.damagedCreatures; + this.damagedCreatures.addAll(watcher.damagedCreatures); } @Override diff --git a/Mage/src/mage/watchers/common/PlayerDamagedBySourceWatcher.java b/Mage/src/mage/watchers/common/PlayerDamagedBySourceWatcher.java index ec6bed5569..71a1925825 100644 --- a/Mage/src/mage/watchers/common/PlayerDamagedBySourceWatcher.java +++ b/Mage/src/mage/watchers/common/PlayerDamagedBySourceWatcher.java @@ -27,15 +27,16 @@ */ package mage.watchers.common; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.Constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.watchers.WatcherImpl; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * Watcher stores whitch sources did damage to a player * @@ -52,7 +53,7 @@ public class PlayerDamagedBySourceWatcher extends WatcherImpl public SourceDidDamageWatcher(final SourceDidDamageWatcher watcher) { super(watcher); - this.damageSources = watcher.damageSources; + this.damageSources.addAll(watcher.damageSources); } @Override