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

Update CharmEffect.java

Browse Source 
@TRT please check further, just added NPE check so it will not crash
This commit is contained in:
Anthony Calosa
2022-11-23 15:43:48 +08:00
committed by GitHub
parent 5e1b9db4a6
commit 202c440797
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,10 +65,12 @@ public class CharmEffect extends SpellAbilityEffect {
// using getCardForUi game is not set, so can't guess max charm // using getCardForUi game is not set, so can't guess max charm
num = Integer.MAX_VALUE; num = Integer.MAX_VALUE;
} else { } else {
// fallback needed while ability building // fallback needed while ability building @TRT please check why it broke CharmEffect without using try-catch
try {
if (sa.getActivatingPlayer() == null) { if (sa.getActivatingPlayer() == null) {
sa.setActivatingPlayer(source.getController()); sa.setActivatingPlayer(source.getController());
} }
} catch (Exception e) {}
num = Math.min(AbilityUtils.calculateAmount(source, sa.getParamOrDefault("CharmNum", "1"), sa), list.size()); num = Math.min(AbilityUtils.calculateAmount(source, sa.getParamOrDefault("CharmNum", "1"), sa), list.size());
} }
final int min = sa.hasParam("MinCharmNum") ? AbilityUtils.calculateAmount(source, sa.getParam("MinCharmNum"), sa) : num; final int min = sa.hasParam("MinCharmNum") ? AbilityUtils.calculateAmount(source, sa.getParam("MinCharmNum"), sa) : num;