external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Cleanup.

Browse Source
This commit is contained in:
Sloth
2013-10-12 13:02:12 +00:00
parent 028579eed4
commit 055695890e
1 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/main/java/forge/Card.java
View File

@@ -6820,8 +6820,7 @@ public class Card extends GameEntity implements Comparable<Card> {
} }
for (final String type : this.getType()) { for (final String type : this.getType()) {
if (type.equals("AllCreatureTypes") if (type.equals("AllCreatureTypes") && c1.hasACreatureType()) {
&& (c1.hasACreatureType() || c1.typeContains("AllCreatureTypes"))) {
return true; return true;
} }
if (forge.card.CardType.isACreatureType(type) && c1.isType(type)) { if (forge.card.CardType.isACreatureType(type) && c1.isType(type)) {
@@ -6896,7 +6895,7 @@ public class Card extends GameEntity implements Comparable<Card> {
*/ */
public final boolean hasACreatureType() { public final boolean hasACreatureType() {
for (final String type : this.getType()) { for (final String type : this.getType()) {
if (forge.card.CardType.isACreatureType(type)) { if (forge.card.CardType.isACreatureType(type) || type.equals("AllCreatureTypes")) {
return true; return true;
} }
} }
@@ -8129,31 +8128,31 @@ public class Card extends GameEntity implements Comparable<Card> {
&& !source.getName().contains("Ward of Lights")) { && !source.getName().contains("Ward of Lights")) {
return true; return true;
} }
} else if (kw.equals("Protection from colored spells")) {
if (source.isSpell() && !source.isColorless()) {
return true;
}
} else if (kw.equals("Protection from Dragons")) {
if (source.isType("Dragon")) {
return true;
}
} else if (kw.equals("Protection from Demons")) {
if (source.isType("Demon")) {
return true;
}
} else if (kw.equals("Protection from Goblins")) {
if (source.isType("Goblin")) {
return true;
}
} else if (kw.equals("Protection from Clerics")) {
if (source.isType("Cleric")) {
return true;
}
} else if (kw.equals("Protection from Gorgons")) {
if (source.isType("Gorgon")) {
return true;
}
} }
if (kw.equals("Protection from colored spells")
&& (source.isInstant() || source.isSorcery()
|| (source.isAura() && !source.isInZone(ZoneType.Battlefield)))
&& !source.isColorless()) {
return true;
}
if (kw.equals("Protection from Dragons") && source.isType("Dragon")) {
return true;
}
if (kw.equals("Protection from Demons") && source.isType("Demon")) {
return true;
}
if (kw.equals("Protection from Goblins") && source.isType("Goblin")) {
return true;
}
if (kw.equals("Protection from Clerics") && source.isType("Cleric")) {
return true;
}
if (kw.equals("Protection from Gorgons") && source.isType("Gorgon")) {
return true;
}
} }
} }
return false; return false;