diff --git a/src/forge/card/cardFactory/CardFactory.java b/src/forge/card/cardFactory/CardFactory.java index f445d26c344..4ef32a06bb4 100644 --- a/src/forge/card/cardFactory/CardFactory.java +++ b/src/forge/card/cardFactory/CardFactory.java @@ -117,7 +117,6 @@ public class CardFactory implements NewConstants { private void readCards(File file) { map.clear(); - //ReadCard read = new ReadCard(ForgeProps.getFile(CARDS)); ReadCard read = new ReadCard(ForgeProps.getFile(CARDSFOLDER)); try { read.run(); diff --git a/src/forge/card/cardFactory/CardFactoryUtil.java b/src/forge/card/cardFactory/CardFactoryUtil.java index 1a1d30d7566..e85a3a84fa7 100644 --- a/src/forge/card/cardFactory/CardFactoryUtil.java +++ b/src/forge/card/cardFactory/CardFactoryUtil.java @@ -2063,8 +2063,7 @@ public class CardFactoryUtil { } public static boolean multipleControlled(Card c) { - PlayerZone play = AllZone.getZone(c); - CardList list = new CardList(play.getCards()); + CardList list = AllZoneUtil.getPlayerCardsInPlay(c.getController()); list.remove(c); return list.containsName(c.getName());