From 5b3bc1f96d0e090e9417ae2a59114ea9bd62dad6 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 3 Jan 2019 16:33:04 +0100 Subject: [PATCH] * Angel of Jubilation - Fixed that the effects of the Angel did not handle the range of affected players correctly. --- Mage.Sets/src/mage/cards/a/AngelOfJubilation.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AngelOfJubilation.java b/Mage.Sets/src/mage/cards/a/AngelOfJubilation.java index cb7bd647131..85a34e8ae67 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfJubilation.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfJubilation.java @@ -1,4 +1,3 @@ - package mage.cards.a; import java.util.UUID; @@ -80,7 +79,8 @@ class AngelOfJubilationEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { - for (Player player : game.getPlayers().values()) { + for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) { + Player player = game.getPlayer(playerId); player.setCanPayLifeCost(false); player.setCanPaySacrificeCostFilter(new FilterCreaturePermanent()); } @@ -113,8 +113,10 @@ class AngelOfJubilationSacrificeFilterEffect extends CostModificationEffectImpl @Override public boolean applies(Ability abilityToModify, Ability source, Game game) { - return abilityToModify.getAbilityType() == AbilityType.ACTIVATED - || abilityToModify instanceof SpellAbility; + + return (abilityToModify.getAbilityType() == AbilityType.ACTIVATED + || abilityToModify instanceof SpellAbility) + && game.getState().getPlayersInRange(source.getControllerId(), game).contains(abilityToModify.getControllerId()); } @Override