From 8eb0ef76b84f72a9a64478d851fa34095f29affa Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 19:25:57 +0000 Subject: [PATCH] *Removed the "Triggered" accessor functions and storage from SpellAbility. It's no longer needed. --- src/forge/AbilityFactory.java | 10 ---------- src/forge/SpellAbility.java | 14 +------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/src/forge/AbilityFactory.java b/src/forge/AbilityFactory.java index 420a47a5d6a..02c875a4c49 100644 --- a/src/forge/AbilityFactory.java +++ b/src/forge/AbilityFactory.java @@ -831,16 +831,6 @@ public class AbilityFactory { } } - else if (defined.equals("TriggeredController")){ - Player p = sa.getTriggeringCard().getController(); - if (!players.contains(p)) - players.add(p); - } - else if (defined.equals("TriggeredOwner")){ - Player p = sa.getTriggeringCard().getOwner(); - if (!players.contains(p)) - players.add(p); - } else if (defined.equals("EnchantedController")){ Player p = card.getEnchantingCard().getController(); if (!players.contains(p)) diff --git a/src/forge/SpellAbility.java b/src/forge/SpellAbility.java index a0083beeec0..3537d76d1d8 100644 --- a/src/forge/SpellAbility.java +++ b/src/forge/SpellAbility.java @@ -27,8 +27,6 @@ public abstract class SpellAbility { private Card targetCard; private Card sourceCard; - private Card triggeringCard = null; - private CardList targetList; private boolean spell; @@ -119,17 +117,7 @@ public abstract class SpellAbility { public void setManaCost(String cost) { manaCost = cost; } - - public Card getTriggeringCard() - { - return triggeringCard; - } - - public void setTriggeringCard(Card c) - { - triggeringCard = c; - } - + public String getAdditionalManaCost() { return additionalManaCost; }