From 3040891eb8569a61f805d672a6df7b29b1c01070 Mon Sep 17 00:00:00 2001 From: Sloth Date: Tue, 1 Nov 2011 16:17:35 +0000 Subject: [PATCH] - Replaced some unnecessary uses of getZoneOf. --- src/main/java/forge/DefaultPlayerZone.java | 10 ++++++---- src/main/java/forge/MagicStack.java | 6 +++--- .../java/forge/card/cardFactory/CardFactoryUtil.java | 2 +- src/main/java/forge/card/cost/CostDiscard.java | 2 +- src/main/java/forge/card/cost/CostReveal.java | 2 +- .../java/forge/card/spellability/Spell_Permanent.java | 2 +- src/main/java/forge/card/trigger/Trigger.java | 6 ++++-- 7 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/main/java/forge/DefaultPlayerZone.java b/src/main/java/forge/DefaultPlayerZone.java index aadad43481c..7b5909929bf 100644 --- a/src/main/java/forge/DefaultPlayerZone.java +++ b/src/main/java/forge/DefaultPlayerZone.java @@ -59,8 +59,9 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl // don't want to log those. if (!c.isImmutable()) { this.cardsAddedThisTurn.add(c); - if (AllZone.getZoneOf(c) != null) { - this.cardsAddedThisTurnSource.add(AllZone.getZoneOf(c).getZoneType()); + PlayerZone zone = AllZone.getZoneOf(c); + if (zone != null) { + this.cardsAddedThisTurnSource.add(zone.getZoneType()); } else { this.cardsAddedThisTurnSource.add(null); } @@ -117,8 +118,9 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl // don't want to log those. if (!c.isImmutable()) { this.cardsAddedThisTurn.add(c); - if (AllZone.getZoneOf(c) != null) { - this.cardsAddedThisTurnSource.add(AllZone.getZoneOf(c).getZoneType()); + PlayerZone zone = AllZone.getZoneOf(c); + if (zone != null) { + this.cardsAddedThisTurnSource.add(zone.getZoneType()); } else { this.cardsAddedThisTurnSource.add(null); } diff --git a/src/main/java/forge/MagicStack.java b/src/main/java/forge/MagicStack.java index 4cd29539094..34ba9e340c1 100644 --- a/src/main/java/forge/MagicStack.java +++ b/src/main/java/forge/MagicStack.java @@ -160,8 +160,8 @@ public class MagicStack extends MyObservable { // on the stack zone, move there if (ability.isSpell()) { final Card source = ability.getSourceCard(); - if (!source.isCopiedSpell() && !AllZone.getZoneOf(source).is(Constant.Zone.Stack)) { - //ability.setSourceCard(AllZone.getGameAction().moveToStack(source)); + if (!source.isCopiedSpell() && !source.isInZone(Constant.Zone.Stack)) { + ability.setSourceCard(AllZone.getGameAction().moveToStack(source)); } } @@ -957,7 +957,7 @@ public class MagicStack extends MyObservable { // If Spell and still on the Stack then let it goto the graveyard or // replace its own movement else if (!source.isCopiedSpell() && (source.isInstant() || source.isSorcery() || fizzle) - && AllZone.getZoneOf(source).is(Constant.Zone.Stack)) { + && source.isInZone(Constant.Zone.Stack)) { AllZone.getGameAction().moveToGraveyard(source); } } diff --git a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java index 32cc34f12b4..6354786c514 100644 --- a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java @@ -2386,7 +2386,7 @@ public class CardFactoryUtil { } else { // If an Aura's target is removed before it resolves, the Aura // fizzles - if (source.isAura() && !AllZone.getZoneOf(target).is(Constant.Zone.Battlefield)) { + if (source.isAura() && !target.isInZone(Constant.Zone.Battlefield)) { return false; } } diff --git a/src/main/java/forge/card/cost/CostDiscard.java b/src/main/java/forge/card/cost/CostDiscard.java index d40937a4408..1e6ed392de7 100644 --- a/src/main/java/forge/card/cost/CostDiscard.java +++ b/src/main/java/forge/card/cost/CostDiscard.java @@ -96,7 +96,7 @@ public class CostDiscard extends CostPartWithList { final Integer amount = this.convertAmount(); if (this.getThis()) { - if (!AllZone.getZoneOf(source).is(Constant.Zone.Hand)) { + if (!source.isInZone(Constant.Zone.Hand)) { return false; } } else if (type.equals("Hand")) { diff --git a/src/main/java/forge/card/cost/CostReveal.java b/src/main/java/forge/card/cost/CostReveal.java index 5309c0b44bb..92f8a82338f 100644 --- a/src/main/java/forge/card/cost/CostReveal.java +++ b/src/main/java/forge/card/cost/CostReveal.java @@ -48,7 +48,7 @@ public class CostReveal extends CostPartWithList { final Integer amount = this.convertAmount(); if (this.getThis()) { - if (!AllZone.getZoneOf(source).is(Constant.Zone.Hand)) { + if (!source.isInZone(Constant.Zone.Hand)) { return false; } } else { diff --git a/src/main/java/forge/card/spellability/Spell_Permanent.java b/src/main/java/forge/card/spellability/Spell_Permanent.java index 1e313f5f33c..9f9598586f1 100644 --- a/src/main/java/forge/card/spellability/Spell_Permanent.java +++ b/src/main/java/forge/card/spellability/Spell_Permanent.java @@ -286,7 +286,7 @@ public class Spell_Permanent extends Spell { } final CardList cl = (CardList) this.championGetCreature.execute(); - if ((o == null) || !(cl.size() > 0) || !AllZone.getZoneOf(this.getSourceCard()).is(Constant.Zone.Hand)) { + if ((o == null) || !(cl.size() > 0) || !this.getSourceCard().isInZone(Constant.Zone.Hand)) { return false; } } diff --git a/src/main/java/forge/card/trigger/Trigger.java b/src/main/java/forge/card/trigger/Trigger.java index 01551402432..66ed71cddc3 100644 --- a/src/main/java/forge/card/trigger/Trigger.java +++ b/src/main/java/forge/card/trigger/Trigger.java @@ -12,6 +12,7 @@ import forge.CardList; import forge.CardUtil; import forge.Constant.Zone; import forge.Player; +import forge.PlayerZone; import forge.card.abilityFactory.AbilityFactory; import forge.card.cardFactory.CardFactoryUtil; import forge.card.spellability.SpellAbility; @@ -292,13 +293,14 @@ public abstract class Trigger { public final boolean zonesCheck() { if (mapParams.containsKey("TriggerZones")) { List triggerZones = new ArrayList(); + PlayerZone zone = AllZone.getZoneOf(hostCard); for (String s : mapParams.get("TriggerZones").split(",")) { triggerZones.add(Zone.smartValueOf(s)); } - if (AllZone.getZoneOf(hostCard) == null) { + if (zone == null) { return false; } - if (!triggerZones.contains(AllZone.getZoneOf(hostCard).getZoneType()) || hostCard.isPhasedOut()) { + if (!triggerZones.contains(zone.getZoneType()) || hostCard.isPhasedOut()) { return false; } }