github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix #8073, Vial Smasher will not target invalid opponents

Browse source
This commit is contained in:
Ingmar Goudt 2021-08-06 23:08:37 +02:00
parent 3bb432a037
commit b15e97fa6f
1 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Mage.Sets/src/mage/cards/v/VialSmasherTheFierce.java
View file

@ -20,13 +20,13 @@ import mage.game.permanent.Permanent;
import mage.game.stack.Spell; import mage.game.stack.Spell;
import mage.players.Player; import mage.players.Player;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import mage.util.RandomUtil;
import mage.watchers.common.SpellsCastWatcher; import mage.watchers.common.SpellsCastWatcher;
import java.util.Iterator; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Objects;
import java.util.UUID; import java.util.UUID;
import java.util.stream.Collectors;
/** /**
* @author LevelX2 * @author LevelX2
@ -123,17 +123,20 @@ class VialSmasherTheFierceEffect extends OneShotEffect {
if (controller != null) { if (controller != null) {
int damage = (Integer) getValue("VialSmasherTheFierceCMC"); int damage = (Integer) getValue("VialSmasherTheFierceCMC");
if (damage > 0) { if (damage > 0) {
Set<UUID> opponents = game.getOpponents(source.getControllerId()); List<Player> opponents = game.getOpponents(source.getControllerId())
int random = RandomUtil.nextInt(opponents.size()); .stream()
Iterator<UUID> iterator = opponents.iterator(); .map(game::getPlayer)
for (int i = 0; i < random; i++) { .filter(Objects::nonNull)
iterator.next(); .filter(o -> !o.hasLost())
.filter(o -> !o.hasLeft())
.collect(Collectors.toList());
if(opponents.isEmpty()){
return false;
} }
UUID opponentId = iterator.next(); Collections.shuffle(opponents);
Player opponent = game.getPlayer(opponentId); Player opponent = opponents.get(0);
if (opponent != null) {
game.informPlayers(opponent.getLogName() + " was chosen at random."); game.informPlayers(opponent.getLogName() + " was chosen at random.");
if (game.getBattlefield().getAllActivePermanents(new FilterPlaneswalkerPermanent(), opponentId, game).size() > 0) { if (game.getBattlefield().getAllActivePermanents(new FilterPlaneswalkerPermanent(), opponent.getId(), game).size() > 0) {
if (controller.chooseUse(Outcome.Damage, "Redirect to a planeswalker controlled by " + opponent.getLogName() + "?", source, game)) { if (controller.chooseUse(Outcome.Damage, "Redirect to a planeswalker controlled by " + opponent.getLogName() + "?", source, game)) {
FilterPlaneswalkerPermanent filter = new FilterPlaneswalkerPermanent("a planeswalker controlled by " + opponent.getLogName()); FilterPlaneswalkerPermanent filter = new FilterPlaneswalkerPermanent("a planeswalker controlled by " + opponent.getLogName());
filter.add(new ControllerIdPredicate(opponent.getId())); filter.add(new ControllerIdPredicate(opponent.getId()));
@ -147,7 +150,7 @@ class VialSmasherTheFierceEffect extends OneShotEffect {
} }
} }
opponent.damage(damage, source.getSourceId(), source, game); opponent.damage(damage, source.getSourceId(), source, game);
}
} }
return true; return true;
} }