diff --git a/src/forge/Card.java b/src/forge/Card.java index d207fb6257b..654115ed7a3 100644 --- a/src/forge/Card.java +++ b/src/forge/Card.java @@ -2738,7 +2738,7 @@ public class Card extends MyObservable { String incR[] = Restriction.split("\\."); // Inclusive restrictions are Card types - if (incR[0].equals("Spell") && isType("Land")) + if (incR[0].equals("Spell") && isLand()) return false; if (incR[0].equals("Permanent") && (isInstant() || isType("Sorcery"))) return false; diff --git a/src/forge/RunTest.java b/src/forge/RunTest.java index b9f95619e9c..c27c4dd7b94 100644 --- a/src/forge/RunTest.java +++ b/src/forge/RunTest.java @@ -34,7 +34,7 @@ public class RunTest c = cf.getCard("Bayou", null); check("17", c.getManaCost().equals("")); - check("18", c.isType("Land")); + check("18", c.isLand()); check("19", c.isType("Swamp")); check("20", c.isType("Forest")); diff --git a/src/forge/card/cardFactory/CardFactory.java b/src/forge/card/cardFactory/CardFactory.java index 92510e5accd..213a2c5f635 100644 --- a/src/forge/card/cardFactory/CardFactory.java +++ b/src/forge/card/cardFactory/CardFactory.java @@ -158,7 +158,7 @@ public class CardFactory implements NewConstants { card2 = CardFactory_Planeswalkers.getCard(in, in.getName(), in.getOwner()); return card2; - } else if (in.isType("Land")) { + } else if (in.isLand()) { Card card2 = new Card(); card2 = CardFactory_Lands.getCard(in, in.getName(), in.getOwner()); @@ -826,7 +826,7 @@ public class CardFactory implements NewConstants { card2 = CardFactory_Equipment.getCard(card, cardName, owner); } else if (card.isType("Planeswalker")) { card2 = CardFactory_Planeswalkers.getCard(card, cardName, owner); - } else if (card.isType("Land")) { + } else if (card.isLand()) { card2 = CardFactory_Lands.getCard(card, cardName, owner); } else if (card.isInstant()) { card2 = CardFactory_Instants.getCard(card, cardName, owner); diff --git a/src/forge/card/cardFactory/CardFactory_Sorceries.java b/src/forge/card/cardFactory/CardFactory_Sorceries.java index b9e9e2228ae..750f84c00f2 100644 --- a/src/forge/card/cardFactory/CardFactory_Sorceries.java +++ b/src/forge/card/cardFactory/CardFactory_Sorceries.java @@ -1482,24 +1482,24 @@ public class CardFactory_Sorceries { CardList list = AllZoneUtil.getPlayerHand(AllZone.ComputerPlayer); list.shuffle(); - if(list.size() == 0) return; + if (list.size() == 0) return; Card c1 = list.get(0); list.remove(c1); c1.getController().discard(c1, null); - if(list.size() == 0) return; + if (list.size() == 0) return; Card c2 = list.get(0); list.remove(c2); c2.getController().discard(c2, null); - if(c1.isType("Land")) { + if (c1.isLand()) { AllZone.HumanPlayer.gainLife(3, card); } - if(c2.isType("Land")) { + if (c2.isLand()) { AllZone.HumanPlayer.gainLife(3, card); } @@ -1518,7 +1518,7 @@ public class CardFactory_Sorceries { c.getController().discard(c, null); - if (c.isType("Land")) { + if (c.isLand()) { AllZone.ComputerPlayer.gainLife(3, card); } @@ -1530,7 +1530,7 @@ public class CardFactory_Sorceries { c2.getController().discard(c2, null); - if (c2.isType("Land")) { + if (c2.isLand()) { AllZone.ComputerPlayer.gainLife(3, card); } }