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

Clean up

Browse Source
This commit is contained in:
tool4EvEr
2021-10-16 14:39:23 +02:00
parent dffd95dd08
commit c82826cf09
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/ForgeScript.java
View File

@@ -16,7 +16,6 @@ import forge.game.spellability.SpellAbility;
import forge.game.spellability.SpellAbilityPredicates; import forge.game.spellability.SpellAbilityPredicates;
import forge.game.staticability.StaticAbility; import forge.game.staticability.StaticAbility;
import forge.game.trigger.Trigger; import forge.game.trigger.Trigger;
import forge.game.trigger.WrappedAbility;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.util.Expressions; import forge.util.Expressions;
@@ -111,8 +110,7 @@ public class ForgeScript {
return true; return true;
} }
for (final Trigger trig : cardState.getTriggers()) { for (final Trigger trig : cardState.getTriggers()) {
WrappedAbility wrap = new WrappedAbility(trig, trig.getOverridingAbility(), sourceController); if (trig.getOverridingAbility() != null && trig.getOverridingAbility().isManaAbility()) {
if (wrap.isManaAbility()) {
return true; return true;
} }
} }

4
forge-game/src/main/java/forge/game/spellability/SpellAbility.java
View File

@@ -365,11 +365,11 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
return false; //Loyalty ability, not a mana ability. return false; //Loyalty ability, not a mana ability.
} }
// CR 605.1b // CR 605.1b
if (isWrapper() && this.getTrigger().getMode() != TriggerType.TapsForMana) { if (isTrigger() && this.getTrigger().getMode() != TriggerType.TapsForMana) {
return false; return false;
} }
SpellAbility tail = isWrapper() ? ((WrappedAbility) this).getWrappedAbility() : this; SpellAbility tail = this;
while (tail != null) { while (tail != null) {
if (tail.manaPart != null) { if (tail.manaPart != null) {
return true; return true;