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

WithFlash: refactor into Static

Browse Source
This commit is contained in:
Hans Mackowiak
2020-11-30 10:50:15 +00:00
committed by Michael Kamensky
parent 779da47dcf
commit 49e7f20a41
46 changed files with 185 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java
View File

@@ -128,7 +128,7 @@ public class HumanPlaySpellAbility {
human.incNumManaConversion();
}
if (ability.isAbility() && ability instanceof AbilityActivated) {
if (ability.isAbility() && ability.isActivatedAbility()) {
final Map<String, String> params = Maps.newHashMap();
params.put("ManaColorConversion", "Additive");
@@ -151,6 +151,7 @@ public class HumanPlaySpellAbility {
final boolean prerequisitesMet = announceValuesLikeX()
&& announceType()
&& (!mayChooseTargets || ability.setupTargets()) // if you can choose targets, then do choose them.
&& ability.canCastTiming(human)
&& (isFree || payment.payCost(new HumanCostDecision(controller, human, ability, ability.getHostCard())));
if (!prerequisitesMet) {