From e3750ad335b3daa9eb9d75f96daa5ff9bf62be35 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 20 Apr 2018 08:04:49 +0200 Subject: [PATCH] * Fixed Knight of Malice, Knight of Grace that boost only worked if all players had a permanent with the needed color (fixes #4811). --- Mage.Sets/src/mage/cards/h/HeartOfKiran.java | 2 +- .../condition/common/AnyPlayerControlsCondition.java | 10 +--------- .../game/command/emblems/LilianaTheLastHopeEmblem.java | 1 + 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Mage.Sets/src/mage/cards/h/HeartOfKiran.java b/Mage.Sets/src/mage/cards/h/HeartOfKiran.java index 728776ed32..0c51696f4c 100644 --- a/Mage.Sets/src/mage/cards/h/HeartOfKiran.java +++ b/Mage.Sets/src/mage/cards/h/HeartOfKiran.java @@ -73,7 +73,7 @@ public class HeartOfKiran extends CardImpl { // You may remove a loyalty counter from a planeswalker you control rather than pay Heart of Kiran's crew cost. Cost cost = new HeartOfKiranAlternateCrewCost(CounterType.LOYALTY, 1); - Effect effect = new AddCardTypeSourceEffect(Duration.EndOfTurn, CardType.CREATURE, CardType.CREATURE); + Effect effect = new AddCardTypeSourceEffect(Duration.EndOfTurn, CardType.CREATURE); effect.setText("You may remove a loyalty counter from a planeswalker you control rather than pay {this}'s crew cost"); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, cost)); } diff --git a/Mage/src/main/java/mage/abilities/condition/common/AnyPlayerControlsCondition.java b/Mage/src/main/java/mage/abilities/condition/common/AnyPlayerControlsCondition.java index e1f987096f..5a7434da34 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/AnyPlayerControlsCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/AnyPlayerControlsCondition.java @@ -27,7 +27,6 @@ */ package mage.abilities.condition.common; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.filter.FilterPermanent; @@ -46,13 +45,6 @@ public class AnyPlayerControlsCondition implements Condition { @Override public boolean apply(Game game, Ability source) { - - for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) { - if (game.getBattlefield().countAll(filter, playerId, game) == 0) { - return false; - } - - } - return true; + return game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game) > 0; } } diff --git a/Mage/src/main/java/mage/game/command/emblems/LilianaTheLastHopeEmblem.java b/Mage/src/main/java/mage/game/command/emblems/LilianaTheLastHopeEmblem.java index 824ea46097..0199536c52 100644 --- a/Mage/src/main/java/mage/game/command/emblems/LilianaTheLastHopeEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/LilianaTheLastHopeEmblem.java @@ -47,6 +47,7 @@ import mage.game.permanent.token.ZombieToken; */ public class LilianaTheLastHopeEmblem extends Emblem { + // "At the beginning of your end step, create X 2/2 black Zombie creature tokens, where X is two plus the number of Zombies you control." public LilianaTheLastHopeEmblem() { this.setName("Emblem Liliana"); Ability ability = new BeginningOfEndStepTriggeredAbility(Zone.COMMAND, new CreateTokenEffect(new ZombieToken(), new LilianaZombiesCount()),