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

Merge branch 'replaceAddCounterValidSource' into 'master'

Browse Source 
ReplaceAddCounter: add ValidSource and extend ValidObject

See merge request core-developers/forge!3706
This commit is contained in:
Michael Kamensky
2021-02-02 16:18:05 +00:00
parent b2cf3444e4 d87fd1c376
commit acbd82ef7f
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java
View File

@@ -45,7 +45,7 @@ public class ReplaceAddCounter extends ReplacementEffect {
if (!(o instanceof Card)) {
return false;
}
if (!matchesValid(o, getParam("ValidCard").split(","), this.getHostCard())) {
if (!matchesValid(o, getParam("ValidCard").split(","), getHostCard())) {
return false;
}
} else if (hasParam("ValidPlayer")) {
@@ -53,7 +53,17 @@ public class ReplaceAddCounter extends ReplacementEffect {
if (!(o instanceof Player)) {
return false;
}
if (!matchesValid(o, getParam("ValidPlayer").split(","), this.getHostCard())) {
if (!matchesValid(o, getParam("ValidPlayer").split(","), getHostCard())) {
return false;
}
} else if (hasParam("ValidObject")) {
if (!matchesValid(runParams.get(AbilityKey.Affected), getParam("ValidObject").split(","), getHostCard())) {
return false;
}
}
if (hasParam("ValidSource")) {
if (!matchesValid(runParams.get(AbilityKey.Source), getParam("ValidSource").split(","), getHostCard())) {
return false;
}
}
@@ -81,6 +91,7 @@ public class ReplaceAddCounter extends ReplacementEffect {
} else if (o instanceof Player) {
sa.setReplacingObject(AbilityKey.Player, o);
}
sa.setReplacingObject(AbilityKey.Object, o);
}
}