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

Fix NoAbilities failing for basic land types

Browse Source
This commit is contained in:
tool4EvEr
2021-04-07 22:11:47 +02:00
parent 3aff3c51a8
commit 1c4640d69b
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -2731,6 +2731,15 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
return false; return false;
} }
public boolean hasRemoveAll() {
for (final CardTraitChanges ck : changedCardTraits.values()) {
if (ck.isRemoveAll()) {
return true;
}
}
return false;
}
public void updateSpellAbilities(List<SpellAbility> list, CardState state, Boolean mana) { public void updateSpellAbilities(List<SpellAbility> list, CardState state, Boolean mana) {
if (hasRemoveIntrinsic()) { if (hasRemoveIntrinsic()) {
list.clear(); list.clear();

3
forge-game/src/main/java/forge/game/card/CardProperty.java
View File

@@ -1749,7 +1749,8 @@ public class CardProperty {
return false; return false;
} }
} else if (property.equals("NoAbilities")) { } else if (property.equals("NoAbilities")) {
if (!((card.getAbilityText().trim().equals("") || card.isFaceDown()) && (card.getUnhiddenKeywords().isEmpty()))) { // basic land types have no ability text, so need extra check
if (!((card.getAbilityText().trim().equals("") || card.isFaceDown()) && (!card.isLand() || card.hasRemoveAll()) && card.getUnhiddenKeywords().isEmpty())) {
return false; return false;
} }
} else if (property.equals("HasCounters")) { } else if (property.equals("HasCounters")) {