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

Clean up

Browse Source
This commit is contained in:
tool4EvEr
2021-05-24 08:13:09 +02:00
parent 6bce621da4
commit ef4ab9570a
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
View File

@@ -51,12 +51,10 @@ import forge.util.collect.FCollection;
* @version $Id$ * @version $Id$
*/ */
public class SpellAbilityRestriction extends SpellAbilityVariables { public class SpellAbilityRestriction extends SpellAbilityVariables {
// A class for handling SpellAbility Restrictions. These restrictions // A class for handling SpellAbility Restrictions. These restrictions include:
// include:
// Zone, Phase, OwnTurn, Speed (instant/sorcery), Amount per Turn, Player, // Zone, Phase, OwnTurn, Speed (instant/sorcery), Amount per Turn, Player,
// Threshold, Metalcraft, LevelRange, etc // Threshold, Metalcraft, LevelRange, etc
// Each value will have a default, that can be overridden (mostly by // Each value will have a default, that can be overridden (mostly by AbilityFactory)
// AbilityFactory)
// The canPlay function will use these values to determine if the current // The canPlay function will use these values to determine if the current
// game state is ok with these restrictions // game state is ok with these restrictions
@@ -265,13 +263,13 @@ public class SpellAbilityRestriction extends SpellAbilityVariables {
} }
if (params.containsKey("Affected")) { if (params.containsKey("Affected")) {
if (!cp.isValid(params.get("Affected").split(","), activator, o.getHost(), sa)) { if (!cp.isValid(params.get("Affected").split(","), activator, o.getHost(), o.getAbility())) {
return false; return false;
} }
} }
if (params.containsKey("ValidSA")) { if (params.containsKey("ValidSA")) {
if (!sa.isValid(params.get("ValidSA").split(","), activator, o.getHost(), sa)) { if (!sa.isValid(params.get("ValidSA").split(","), activator, o.getHost(), o.getAbility())) {
return false; return false;
} }
} }