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

Merge branch 'mana' into 'master'

Browse Source 
ManaEffect: Skip producing mana from nothing

See merge request core-developers/forge!4593
This commit is contained in:
Hans Mackowiak
2021-04-28 21:00:57 +00:00
parent 0ebc6dd2d8 9afc192154
commit 0ece4427b6
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,8 @@ import forge.game.spellability.AbilityManaPart;
import forge.game.spellability.SpellAbility;
import forge.game.zone.ZoneType;
import forge.util.Localizer;
import io.sentry.Sentry;
import io.sentry.event.BreadcrumbBuilder;
public class ManaEffect extends SpellAbilityEffect {
@@ -199,13 +201,21 @@ public class ManaEffect extends SpellAbilityEffect {
}
abMana.setExpressChoice(sb.toString().trim());
}
}
if (abMana.getExpressChoice().isEmpty()) {
System.out.println("AbilityFactoryMana::manaResolve() - special mana effect is empty for " + sa.getHostCard().getName());
}
}
String mana = GameActionUtil.generatedMana(sa);
abMana.produceMana(GameActionUtil.generatedMana(sa), p, sa);
// this can happen when mana is based on criteria that didn't match
if (mana.isEmpty()) {
String msg = "AbilityFactoryMana::manaResolve() - special mana effect is empty for";
Sentry.getContext().recordBreadcrumb(
new BreadcrumbBuilder().setMessage(msg)
.withData("Card", card.getName()).withData("SA", sa.toString()).build()
);
continue;
}
abMana.produceMana(mana, p, sa);
}
// Only clear express choice after mana has been produced

2
forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
View File

@@ -500,6 +500,8 @@ public class AbilityManaPart implements java.io.Serializable {
* @return a boolean.
*/
public final boolean canProduce(final String s, final SpellAbility sa) {
// TODO: need to handle replacement effects like 106.7
// Any mana never means Colorless?
if (isAnyMana() && !s.equals("C")) {
return true;