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

7
Mage/src/main/java/mage/abilities/effects/common/DamageAllControlledTargetEffect.java
View file

@ -33,7 +33,6 @@ import mage.abilities.effects.OneShotEffect;
import mage.filter.FilterPermanent;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
/**
*
@ -64,11 +63,7 @@ public class DamageAllControlledTargetEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayerOrPlaneswalkerController(source.getFirstTarget());
if (player == null) {
return false;
}
for (Permanent permanent : game.getBattlefield().getAllActivePermanents(filter, player.getId(), game)) {
for (Permanent permanent : game.getBattlefield().getAllActivePermanents(filter, source.getFirstTarget(), game)) {
permanent.damage(amount, source.getSourceId(), game, false, true);
}
return true;