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

Merge pull request #2955 from kevlahnota/newmaster2

Browse Source 
commented out check for API fpr "Any"
This commit is contained in:
Anthony Calosa
2023-04-18 16:22:18 +08:00
committed by GitHub
parent a7163ba6a2 fb61dc9f6b
commit 8d308d30eb
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5344,11 +5344,12 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
if (!(isCreature() || isPlaneswalker() || isBattle())) {
return false;
}
if (spellAbility == null)
//todo further check for Effect API and other replacement Effect
/*if (spellAbility == null)
return false;
ApiType apiType = ((SpellAbility) spellAbility).getApi();
if (!(ApiType.DealDamage.equals(apiType) || ApiType.PreventDamage.equals(apiType)))
return false;
return false;*/
} else if (!getType().hasStringType(incR[0])) {
return testFailed; // Check for wrong type
}

5
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -2125,11 +2125,12 @@ public class Player extends GameEntity implements Comparable<Player> {
return false;
}
} else if (incR[0].equals("Any")) {
if (spellAbility == null)
//todo further check for Effect API and other replacement Effect
/*if (spellAbility == null)
return false;
ApiType apiType = ((SpellAbility) spellAbility).getApi();
if (!(ApiType.DealDamage.equals(apiType) || ApiType.PreventDamage.equals(apiType)))
return false;
return false;*/
} else if (!incR[0].equals("Player")) {
return false;
}