From e8be81cd34ab6d404e8f9a4c675847840090f3ff Mon Sep 17 00:00:00 2001 From: BetaSteward Date: Mon, 15 Nov 2010 03:40:47 +0000 Subject: [PATCH] fixes --- Mage.Sets/src/mage/sets/magic2011/FrostTitan.java | 2 +- Mage.Sets/src/mage/sets/magic2011/GaeasRevenge.java | 2 +- .../effects/common/CantCounterSourceEffect.java | 8 ++++++-- .../effects/common/CantTargetControlledEffect.java | 2 -- .../effects/common/CantTargetControllerEffect.java | 8 +++++--- .../effects/common/CantTargetSourceEffect.java | 8 +++++--- .../effects/common/CounterUnlessPaysEffect.java | 2 +- Mage/src/mage/game/stack/Spell.java | 2 +- Mage/src/mage/game/stack/SpellStack.java | 3 ++- Mage/src/mage/game/stack/StackAbility.java | 5 +---- Mage/src/mage/target/TargetImpl.java | 10 +++++----- 11 files changed, 28 insertions(+), 24 deletions(-) diff --git a/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java b/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java index 5116f04284..048736af45 100644 --- a/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java @@ -97,7 +97,7 @@ class FrostTitanAbility1 extends TriggeredAbilityImpl { @Override public boolean checkTrigger(GameEvent event, Game game) { - if (event.getType() == EventType.TARGET && event.getTargetId().equals(this.getSourceId()) && game.getOpponents(this.controllerId).contains(event.getPlayerId())) { + if (event.getType() == EventType.TARGETED && event.getTargetId().equals(this.getSourceId()) && game.getOpponents(this.controllerId).contains(event.getPlayerId())) { this.getTargets().clear(); TargetStackObject target = new TargetStackObject(); target.add(event.getSourceId(), game); diff --git a/Mage.Sets/src/mage/sets/magic2011/GaeasRevenge.java b/Mage.Sets/src/mage/sets/magic2011/GaeasRevenge.java index 944563c81f..ffcc7f0ec6 100644 --- a/Mage.Sets/src/mage/sets/magic2011/GaeasRevenge.java +++ b/Mage.Sets/src/mage/sets/magic2011/GaeasRevenge.java @@ -56,7 +56,7 @@ public class GaeasRevenge extends CardImpl { } public GaeasRevenge(UUID ownerId) { - super(ownerId, 174, "GaeasRevenge", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{5}{G}{G}"); + super(ownerId, 174, "Gaea's Revenge", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{5}{G}{G}"); this.expansionSetCode = "M11"; this.subtype.add("Elemental"); this.color.setGreen(true); diff --git a/Mage/src/mage/abilities/effects/common/CantCounterSourceEffect.java b/Mage/src/mage/abilities/effects/common/CantCounterSourceEffect.java index ef8a3b0c28..ac72a4f703 100644 --- a/Mage/src/mage/abilities/effects/common/CantCounterSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantCounterSourceEffect.java @@ -28,6 +28,7 @@ package mage.abilities.effects.common; +import java.util.UUID; import mage.Constants.Duration; import mage.Constants.Outcome; import mage.abilities.Ability; @@ -67,8 +68,11 @@ public class CantCounterSourceEffect extends ReplacementEffectImpl { - private FilterObject filterSource; + private FilterStackObject filterSource; - public CantTargetControllerEffect(FilterObject filterSource, Duration duration) { + public CantTargetControllerEffect(FilterStackObject filterSource, Duration duration) { super(duration, Outcome.Benefit); this.filterSource = filterSource; } @@ -74,7 +76,7 @@ public class CantTargetControllerEffect extends ReplacementEffectImpl { - private FilterObject filterSource; + private FilterStackObject filterSource; - public CantTargetSourceEffect(FilterObject filterSource, Duration duration) { + public CantTargetSourceEffect(FilterStackObject filterSource, Duration duration) { super(duration, Outcome.Benefit); this.filterSource = filterSource; } @@ -74,7 +76,7 @@ public class CantTargetSourceEffect extends ReplacementEffectImpl> implements StackObject, Card { @Override public UUID getId() { - return card.getId(); + return ability.getId(); } @Override diff --git a/Mage/src/mage/game/stack/SpellStack.java b/Mage/src/mage/game/stack/SpellStack.java index 4b98eaed98..990cf59eb3 100644 --- a/Mage/src/mage/game/stack/SpellStack.java +++ b/Mage/src/mage/game/stack/SpellStack.java @@ -115,7 +115,8 @@ public class SpellStack extends Stack { public StackObject getStackObject(UUID id) { for (StackObject stackObject: this) { - if (stackObject.getId().equals(id)) + UUID objectId = stackObject.getId(); + if (objectId.equals(id)) return stackObject; } return null; diff --git a/Mage/src/mage/game/stack/StackAbility.java b/Mage/src/mage/game/stack/StackAbility.java index 7ff3fea458..4730bedce9 100644 --- a/Mage/src/mage/game/stack/StackAbility.java +++ b/Mage/src/mage/game/stack/StackAbility.java @@ -70,10 +70,8 @@ public class StackAbility implements StackObject, Ability { private Ability ability; private UUID controllerId; - private UUID id; public StackAbility(Ability ability, UUID controllerId) { - this.id = UUID.randomUUID(); this.ability = ability; this.controllerId = controllerId; } @@ -81,7 +79,6 @@ public class StackAbility implements StackObject, Ability { public StackAbility(final StackAbility spell) { this.ability = spell.ability.copy(); this.controllerId = spell.controllerId; - this.id = spell.id; } @Override @@ -164,7 +161,7 @@ public class StackAbility implements StackObject, Ability { @Override public UUID getId() { - return this.id; + return this.ability.getId(); } @Override diff --git a/Mage/src/mage/target/TargetImpl.java b/Mage/src/mage/target/TargetImpl.java index 6f44ff44d6..24087eee33 100644 --- a/Mage/src/mage/target/TargetImpl.java +++ b/Mage/src/mage/target/TargetImpl.java @@ -160,10 +160,10 @@ public abstract class TargetImpl> implements Target { if (maxNumberOfTargets == 0 || targets.size() < maxNumberOfTargets) { if (!targets.containsKey(id)) { if (source != null) { - if (!game.replaceEvent(GameEvent.getEvent(EventType.TARGET, id, source.getSourceId(), source.getControllerId()))) { + if (!game.replaceEvent(GameEvent.getEvent(EventType.TARGET, id, source.getId(), source.getControllerId()))) { targets.put(id, 0); chosen = targets.size() >= minNumberOfTargets; - game.fireEvent(GameEvent.getEvent(EventType.TARGETED, id, source.getSourceId(), source.getControllerId())); + game.fireEvent(GameEvent.getEvent(EventType.TARGETED, id, source.getId(), source.getControllerId())); } } else { @@ -179,10 +179,10 @@ public abstract class TargetImpl> implements Target { amount += targets.get(id); } if (source != null) { - if (!game.replaceEvent(GameEvent.getEvent(EventType.TARGET, id, source.getSourceId(), source.getControllerId()))) { + if (!game.replaceEvent(GameEvent.getEvent(EventType.TARGET, id, source.getId(), source.getControllerId()))) { targets.put(id, amount); chosen = targets.size() >= minNumberOfTargets; - game.fireEvent(GameEvent.getEvent(EventType.TARGETED, id, source.getSourceId(), source.getControllerId())); + game.fireEvent(GameEvent.getEvent(EventType.TARGETED, id, source.getId(), source.getControllerId())); } } else { @@ -229,7 +229,7 @@ public abstract class TargetImpl> implements Target { @Override public boolean isLegal(Ability source, Game game) { for (UUID targetId: targets.keySet()) { - if (game.replaceEvent(GameEvent.getEvent(EventType.TARGET, targetId, source.getSourceId(), source.getControllerId()))) + if (game.replaceEvent(GameEvent.getEvent(EventType.TARGET, targetId, source.getId(), source.getControllerId()))) return false; if (!canTarget(targetId, source, game)) return false;