Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Revert "Merge branch 'planeswalkerErrata' into master"

Browse source 
This reverts commit 95d2721421, reversing
changes made to fc4986a589.
This commit is contained in:
Evan Kranzler 2018-04-20 16:41:29 -04:00
parent 95d2721421
commit f10b62f3da
754 changed files with 3051 additions and 3085 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage/src/main/java/mage/target/common/TargetAnyTarget.java
View file

@ -15,7 +15,8 @@ import mage.players.Player;
import mage.target.TargetImpl;
/**
* @author JRHerlehy Created on 4/8/18.
* @author JRHerlehy
* Created on 4/8/18.
*/
public class TargetAnyTarget extends TargetImpl {
@ -164,14 +165,14 @@ public class TargetAnyTarget extends TargetImpl {
for (UUID playerId : game.getState().getPlayersInRange(sourceControllerId, game)) {
Player player = game.getPlayer(playerId);
if (player != null
&& player.canBeTargetedBy(targetSource, sourceControllerId, game)
&& filter.getPlayerFilter().match(player, sourceId, sourceControllerId, game)) {
&& player.canBeTargetedBy(targetSource, sourceControllerId, game)
&& filter.getPlayerFilter().match(player, sourceId, sourceControllerId, game)) {
possibleTargets.add(playerId);
}
}
for (Permanent permanent : game.getBattlefield().getActivePermanents(filter.getCreatureFilter(), sourceControllerId, game)) {
if (permanent.canBeTargetedBy(targetSource, sourceControllerId, game)
&& filter.getCreatureFilter().match(permanent, sourceId, sourceControllerId, game)) {
&& filter.getCreatureFilter().match(permanent, sourceId, sourceControllerId, game)) {
possibleTargets.add(permanent.getId());
}
}