Revert "Revert "Merge branch 'planeswalkerErrata' into master""

This reverts commit f10b62f3da.
This commit is contained in:
Evan Kranzler 2018-04-20 20:42:04 -04:00
parent ddf5aa3b4e
commit 198be1549d
754 changed files with 3085 additions and 3051 deletions

View file

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