diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java index 215b496dc90..17aa0446feb 100644 --- a/src/main/java/forge/GameAction.java +++ b/src/main/java/forge/GameAction.java @@ -1160,8 +1160,6 @@ public class GameAction { canShowWinLose = true; forge.card.trigger.Trigger.resetIDs(); AllZone.getTriggerHandler().clearTriggerSettings(); - AllZone.getHumanPlayer().setEpicSpell(null); - AllZone.getComputerPlayer().setEpicSpell(null); { //re-number cards just so their unique numbers are low, just for user friendliness CardFactoryInterface c = AllZone.getCardFactory(); diff --git a/src/main/java/forge/Player.java b/src/main/java/forge/Player.java index d0d592a3e4c..01bf1836101 100644 --- a/src/main/java/forge/Player.java +++ b/src/main/java/forge/Player.java @@ -49,8 +49,6 @@ public abstract class Player extends GameEntity { Map zones = new EnumMap(Constant.Zone.class); public final static List ALL_ZONES = Collections.unmodifiableList(Arrays.asList(Zone.Battlefield, Zone.Library, Zone.Graveyard, Zone.Hand, Zone.Exile, Zone.Command)); - - private SpellAbility epicSpell = null; /** *

Constructor for Player.

@@ -1916,18 +1914,4 @@ public abstract class Player extends GameEntity { return p1.getName().equals(getName()); } else return false; } - - /** - * @return the epicSpell - */ - public SpellAbility getEpicSpell() { - return epicSpell; - } - - /** - * @param epicSpell0 the epicSpell to set - */ - public void setEpicSpell(SpellAbility epicSpell0) { - this.epicSpell = epicSpell0; - } } diff --git a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java index 91fc7018527..2f1c1469951 100644 --- a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java @@ -4990,7 +4990,6 @@ public class CardFactoryUtil { @Override public void resolve() { - card.getController().setEpicSpell(origSA); //Create Epic emblem Card eff = new Card(); diff --git a/src/main/java/forge/card/spellability/Spell.java b/src/main/java/forge/card/spellability/Spell.java index 51269131b63..d0165c91284 100644 --- a/src/main/java/forge/card/spellability/Spell.java +++ b/src/main/java/forge/card/spellability/Spell.java @@ -56,10 +56,6 @@ abstract public class Spell extends SpellAbility implements java.io.Serializable @Override public boolean canPlay() { if (AllZone.getStack().isSplitSecondOnStack()) return false; - - if(getSourceCard().getController().getEpicSpell() != null) { - return false; //Player has cast an Epic spell and can't cast more this game. - } Card card = getSourceCard();