From 202c440797b7e37ec9f20d6a2cef4bf74ddc39fc Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Wed, 23 Nov 2022 15:43:48 +0800 Subject: [PATCH] Update CharmEffect.java @TRT please check further, just added NPE check so it will not crash --- .../java/forge/game/ability/effects/CharmEffect.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java index f6955394958..75abd071df1 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java @@ -65,10 +65,12 @@ public class CharmEffect extends SpellAbilityEffect { // using getCardForUi game is not set, so can't guess max charm num = Integer.MAX_VALUE; } else { - // fallback needed while ability building - if (sa.getActivatingPlayer() == null) { - sa.setActivatingPlayer(source.getController()); - } + // fallback needed while ability building @TRT please check why it broke CharmEffect without using try-catch + try { + if (sa.getActivatingPlayer() == null) { + sa.setActivatingPlayer(source.getController()); + } + } catch (Exception e) {} 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;