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

Merge branch 'npefix' into 'master'

Browse Source 
Fix Charm NPE

See merge request core-developers/forge!6487
This commit is contained in:
Michael Kamensky
2022-04-05 18:00:16 +00:00
parent 23fb368bd1 500789e42c
commit ad4a621385
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/ability/CharmAi.java
View File

@@ -34,7 +34,7 @@ public class CharmAi extends SpellAbilityAi {
num = min = choices.size();
} else {
num = AbilityUtils.calculateAmount(source, sa.getParamOrDefault("CharmNum", "1"), sa);
min = sa.hasParam("MinCharmNum") ? AbilityUtils.calculateAmount(source, sa.getParamOrDefault("MinCharmNum", "1"), sa) : num;
min = sa.hasParam("MinCharmNum") ? AbilityUtils.calculateAmount(source, sa.getParam("MinCharmNum"), sa) : num;
}
boolean timingRight = sa.isTrigger(); //is there a reason to play the charm now?

9
forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java
View File

@@ -167,16 +167,17 @@ public class CharmEffect extends SpellAbilityEffect {
return true;
}
Card source = sa.getHostCard();
Player activator = sa.getActivatingPlayer();
final Card source = sa.getHostCard();
final Player activator = sa.getActivatingPlayer();
final int num = Math.min(AbilityUtils.calculateAmount(source, sa.getParamOrDefault("CharmNum", "1"), sa), choices.size());
final int min = sa.hasParam("MinCharmNum") ? AbilityUtils.calculateAmount(source, sa.getParamOrDefault("MinCharmNum", "1"), sa) : num;
int num = AbilityUtils.calculateAmount(source, sa.getParamOrDefault("CharmNum", "1"), sa);
final int min = sa.hasParam("MinCharmNum") ? AbilityUtils.calculateAmount(source, sa.getParam("MinCharmNum"), sa) : num;
// if the amount of choices is smaller than min then they can't be chosen
if (min > choices.size()) {
return false;
}
num = Math.min(num, choices.size());
boolean isOptional = sa.hasParam("Optional");
if (isOptional && !activator.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblWouldYouLikeCharm", CardTranslation.getTranslatedName(source.getName())))) {