From c9c27faf8fd6eeac9f8bab05a93318eea4a95abd Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Thu, 3 Oct 2019 05:45:44 +0000 Subject: [PATCH 1/2] Prevent NPE casting adventure card as spell --- .../src/main/java/forge/game/ability/effects/EffectEffect.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java index 52fce48cc08..b60f3abea6a 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java @@ -158,7 +158,8 @@ public class EffectEffect extends SpellAbilityEffect { if (effectStaticAbilities != null) { for (final String s : effectStaticAbilities) { final StaticAbility addedStaticAbility = eff.addStaticAbility(AbilityUtils.getSVar(sa, s)); - addedStaticAbility.setIntrinsic(true); + if (addedStaticAbility != null) //prevent npe casting adventure card spell + addedStaticAbility.setIntrinsic(true); } } From 90e2c08e75595122c300a8540c499350201d2465 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Thu, 3 Oct 2019 13:54:34 +0000 Subject: [PATCH 2/2] Refactor String.join -> StringUtils.join --- forge-game/src/main/java/forge/game/card/Card.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index ed557824a2f..a24259b01bc 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -5484,7 +5484,7 @@ public class Card extends GameEntity implements Comparable { ability.add(inst.getOriginal()); } Collections.sort(ability); - return String.join(",", ability); + return StringUtils.join(ability.toArray(), ","); //fix nosuchmethod on some android devices... } public Zone getZone() { return currentZone;