From a18dcd9911dcfff3fcbca3ac3e2d9bf908b4433b Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Tue, 9 May 2023 15:59:17 +0400 Subject: [PATCH] Drana and Linvala - fixed game error on usage with same abilities from permanents (NPE error) --- Mage.Sets/src/mage/cards/d/DranaAndLinvala.java | 4 +++- Mage/src/main/java/mage/game/permanent/Permanent.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/cards/d/DranaAndLinvala.java b/Mage.Sets/src/mage/cards/d/DranaAndLinvala.java index 340bfefe3b9..98f769b7a10 100644 --- a/Mage.Sets/src/mage/cards/d/DranaAndLinvala.java +++ b/Mage.Sets/src/mage/cards/d/DranaAndLinvala.java @@ -124,7 +124,9 @@ class DranaAndLinvalaGainAbilitiesEffect extends ContinuousEffectImpl { || ability.getAbilityType() == AbilityType.MANA) .collect(Collectors.toList())) { Ability addedAbility = perm.addAbility(ability, source.getSourceId(), game); - addedAbility.getEffects().setValue("dranaLinvalaFlag", true); + if (addedAbility != null) { + addedAbility.getEffects().setValue("dranaLinvalaFlag", true); + } } return true; } diff --git a/Mage/src/main/java/mage/game/permanent/Permanent.java b/Mage/src/main/java/mage/game/permanent/Permanent.java index c7902d412f4..1223235e5c7 100644 --- a/Mage/src/main/java/mage/game/permanent/Permanent.java +++ b/Mage/src/main/java/mage/game/permanent/Permanent.java @@ -211,6 +211,7 @@ public interface Permanent extends Card, Controllable { * @param ability * @param sourceId * @param game + * @return can be null for exists abilities */ Ability addAbility(Ability ability, UUID sourceId, Game game);