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

Fix Kadena's Silencer

Browse Source
This commit is contained in:
friarsol
2021-01-12 22:46:57 -05:00
parent 7892d0f369
commit 4d6ab47ecf
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java
View File

@@ -29,10 +29,18 @@ public class CounterEffect extends SpellAbilityEffect {
final List<SpellAbility> sas; final List<SpellAbility> sas;
if (sa.hasParam("AllType")) { if (sa.hasParam("AllType")) {
boolean countersSpells = sa.getParam("AllType").contains("Spell");
boolean countersActivated = sa.getParam("AllType").contains("Activated");
boolean countersTriggers = sa.getParam("AllType").contains("Triggered");
sas = Lists.newArrayList(); sas = Lists.newArrayList();
for (SpellAbilityStackInstance si : game.getStack()) { for (SpellAbilityStackInstance si : game.getStack()) {
SpellAbility spell = si.getSpellAbility(true); SpellAbility spell = si.getSpellAbility(true);
if (sa.getParam("AllType").equals("Spell") && !spell.isSpell()) { if (spell.isSpell() && !countersSpells) {
continue;
} else if (spell.isActivatedAbility() && !countersActivated) {
continue;
} else if (spell.isTrigger() && !countersTriggers) {
continue; continue;
} }
if (sa.hasParam("AllValid")) { if (sa.hasParam("AllValid")) {
@@ -74,10 +82,18 @@ public class CounterEffect extends SpellAbilityEffect {
final List<SpellAbility> sas; final List<SpellAbility> sas;
if (sa.hasParam("AllType")) { if (sa.hasParam("AllType")) {
boolean countersSpells = sa.getParam("AllType").contains("Spell");
boolean countersActivated = sa.getParam("AllType").contains("Activated");
boolean countersTriggers = sa.getParam("AllType").contains("Triggered");
sas = Lists.newArrayList(); sas = Lists.newArrayList();
for (SpellAbilityStackInstance si : game.getStack()) { for (SpellAbilityStackInstance si : game.getStack()) {
SpellAbility spell = si.getSpellAbility(true); SpellAbility spell = si.getSpellAbility(true);
if (sa.getParam("AllType").equals("Spell") && !spell.isSpell()) { if (spell.isSpell() && !countersSpells) {
continue;
} else if (spell.isActivatedAbility() && !countersActivated) {
continue;
} else if (spell.isTrigger() && !countersTriggers) {
continue; continue;
} }
if (sa.hasParam("AllValid")) { if (sa.hasParam("AllValid")) {