From 2f80d736c895848f5aa830e72bbce4ec012a52b4 Mon Sep 17 00:00:00 2001 From: Sloth Date: Fri, 3 Feb 2012 19:06:53 +0000 Subject: [PATCH] - Cleanup of old references to the mana pool as a card. --- src/main/java/forge/GameAction.java | 4 ++-- src/main/java/forge/GameActionUtil.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java index 913ada32a52..4fb8621030a 100644 --- a/src/main/java/forge/GameAction.java +++ b/src/main/java/forge/GameAction.java @@ -1088,8 +1088,8 @@ public class GameAction { * @return a boolean. */ public final boolean sacrifice(final Card c) { - if (c.getName().equals("Mana Pool")) { - System.out.println("Trying to sacrifice mana pool..."); + if (c.isImmutable()) { + System.out.println("Trying to sacrifice immutables"); return false; } this.sacrificeDestroy(c); diff --git a/src/main/java/forge/GameActionUtil.java b/src/main/java/forge/GameActionUtil.java index a581ff34edf..dde47a3c53a 100644 --- a/src/main/java/forge/GameActionUtil.java +++ b/src/main/java/forge/GameActionUtil.java @@ -1382,7 +1382,7 @@ public final class GameActionUtil { type = type.filter(new CardListFilter() { @Override public boolean addCard(final Card card) { - return !card.equals(crd) && card.isCreature() && !crd.getName().equals("Mana Pool"); + return !card.equals(crd) && card.isCreature(); } }); final CardList alreadyAdded = new CardList();