diff --git a/Mage.Sets/src/mage/sets/magic2010/BurningInquiry.java b/Mage.Sets/src/mage/sets/magic2010/BurningInquiry.java index 9d5845591d..1722233095 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BurningInquiry.java +++ b/Mage.Sets/src/mage/sets/magic2010/BurningInquiry.java @@ -84,7 +84,12 @@ class BurningInquiryEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - for (UUID playerId : game.getPlayerList()) { + Player controller = game.getPlayer(source.getControllerId()); + if (controller == null) { + return false; + } + + for (UUID playerId : controller.getInRange()) { Player player = game.getPlayer(playerId); if (player != null) { for (int i = 0; i < 3; i++) { diff --git a/Mage/src/mage/abilities/effects/common/SacrificeAllEffect.java b/Mage/src/mage/abilities/effects/common/SacrificeAllEffect.java index 6fd7a88246..7e271bbcbf 100644 --- a/Mage/src/mage/abilities/effects/common/SacrificeAllEffect.java +++ b/Mage/src/mage/abilities/effects/common/SacrificeAllEffect.java @@ -1,108 +1,117 @@ -/* - * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of BetaSteward_at_googlemail.com. - */ - -package mage.abilities.effects.common; - -import mage.Constants.Outcome; -import mage.abilities.Ability; -import mage.abilities.effects.OneShotEffect; -import mage.filter.common.FilterControlledPermanent; -import mage.game.Game; -import mage.game.permanent.Permanent; -import mage.players.Player; -import mage.target.common.TargetControlledPermanent; - -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -/** - * - * @author BetaSteward_at_googlemail.com - */ -public class SacrificeAllEffect extends OneShotEffect { - - protected int amount; - protected FilterControlledPermanent filter; - - public SacrificeAllEffect(FilterControlledPermanent filter) { - this(1, filter); - } - - public SacrificeAllEffect(int amount, FilterControlledPermanent filter) { - super(Outcome.Sacrifice); - this.amount = amount; - this.filter = filter; - setText(); - } - - public SacrificeAllEffect(final SacrificeAllEffect effect) { - super(effect); - this.amount = effect.amount; - this.filter = effect.filter.copy(); - } - - @Override - public SacrificeAllEffect copy() { - return new SacrificeAllEffect(this); - } - - @Override - public boolean apply(Game game, Ability source) { - List perms = new ArrayList(); - for (Player player: game.getPlayers().values()) { - int numTargets = Math.min(amount, game.getBattlefield().countAll(filter, player.getId(), game)); - TargetControlledPermanent target = new TargetControlledPermanent(numTargets, numTargets, filter, false); - if (target.canChoose(player.getId(), game)) { - while (!target.isChosen()) { - player.choose(Outcome.Sacrifice, target, source.getSourceId(), game); - } - perms.addAll(target.getTargets()); - } - } - for (UUID permID: perms) { - Permanent permanent = game.getPermanent(permID); - if (permanent != null) - permanent.sacrifice(source.getSourceId(), game); - } - return true; - } - - private void setText() { - StringBuilder sb = new StringBuilder(); - sb.append("Each players sacrifices "); - if (amount > 1) - sb.append(amount).append(" "); - else - sb.append("a "); - sb.append(filter.getMessage()); - staticText = sb.toString(); - } - - -} +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ + +package mage.abilities.effects.common; + +import mage.Constants.Outcome; +import mage.abilities.Ability; +import mage.abilities.effects.OneShotEffect; +import mage.filter.common.FilterControlledPermanent; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.players.Player; +import mage.target.common.TargetControlledPermanent; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +/** + * + * @author BetaSteward_at_googlemail.com + */ +public class SacrificeAllEffect extends OneShotEffect { + + protected int amount; + protected FilterControlledPermanent filter; + + public SacrificeAllEffect(FilterControlledPermanent filter) { + this(1, filter); + } + + public SacrificeAllEffect(int amount, FilterControlledPermanent filter) { + super(Outcome.Sacrifice); + this.amount = amount; + this.filter = filter; + setText(); + } + + public SacrificeAllEffect(final SacrificeAllEffect effect) { + super(effect); + this.amount = effect.amount; + this.filter = effect.filter.copy(); + } + + @Override + public SacrificeAllEffect copy() { + return new SacrificeAllEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Player controller = game.getPlayer(source.getControllerId()); + if (controller == null) { + return false; + } + + List perms = new ArrayList(); + for (UUID playerId : controller.getInRange()) { + Player player = game.getPlayer(playerId); + if (player != null) { + int numTargets = Math.min(amount, game.getBattlefield().countAll(filter, player.getId(), game)); + TargetControlledPermanent target = new TargetControlledPermanent(numTargets, numTargets, filter, false); + if (target.canChoose(player.getId(), game)) { + while (!target.isChosen()) { + player.choose(Outcome.Sacrifice, target, source.getSourceId(), game); + } + perms.addAll(target.getTargets()); + } + } + } + for (UUID permID : perms) { + Permanent permanent = game.getPermanent(permID); + if (permanent != null) { + permanent.sacrifice(source.getSourceId(), game); + } + } + return true; + } + + private void setText() { + StringBuilder sb = new StringBuilder(); + sb.append("Each players sacrifices "); + if (amount > 1) + sb.append(amount).append(" "); + else + sb.append("a "); + sb.append(filter.getMessage()); + staticText = sb.toString(); + } + + +}