diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java index 9ecd38a37e..4f7063f7b8 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java @@ -867,7 +867,7 @@ public class ComputerPlayer<T extends ComputerPlayer<T>> extends PlayerImpl<T> i } @Override - public void assignDamage(int damage, List<UUID> targets, UUID sourceId, Game game) { + public void assignDamage(int damage, List<UUID> targets, String singleTargetName, UUID sourceId, Game game) { logger.debug("assignDamage"); //TODO: improve this game.getPermanent(targets.get(0)).damage(damage, sourceId, game, true, false); diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java index 2c2d1efc6e..d05fef2ceb 100644 --- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java @@ -485,10 +485,11 @@ public class HumanPlayer extends PlayerImpl<HumanPlayer> { } @Override - public void assignDamage(int damage, List<UUID> targets, UUID sourceId, Game game) { + public void assignDamage(int damage, List<UUID> targets, String singleTargetName, UUID sourceId, Game game) { int remainingDamage = damage; while (remainingDamage > 0) { Target target = new TargetCreatureOrPlayer(); + if (singleTargetName != null) target.setTargetName(singleTargetName); choose(Outcome.Damage, target, game); if (targets.size() == 0 || targets.contains(target.getFirstTarget())) { int damageAmount = getAmount(0, remainingDamage, "Select amount", game); diff --git a/Mage.Server/plugins/mage-player-ai-ma.jar b/Mage.Server/plugins/mage-player-ai-ma.jar index 0b5ec498f5..fb7ec1859b 100644 Binary files a/Mage.Server/plugins/mage-player-ai-ma.jar and b/Mage.Server/plugins/mage-player-ai-ma.jar differ diff --git a/Mage.Server/plugins/mage-player-ai.jar b/Mage.Server/plugins/mage-player-ai.jar index fb9826add2..53cd8af969 100644 Binary files a/Mage.Server/plugins/mage-player-ai.jar and b/Mage.Server/plugins/mage-player-ai.jar differ diff --git a/Mage.Server/plugins/mage-player-aiminimax.jar b/Mage.Server/plugins/mage-player-aiminimax.jar index 47ab2c1225..337b6d855d 100644 Binary files a/Mage.Server/plugins/mage-player-aiminimax.jar and b/Mage.Server/plugins/mage-player-aiminimax.jar differ diff --git a/Mage.Server/plugins/mage-player-human.jar b/Mage.Server/plugins/mage-player-human.jar index f4adf9b370..ae6d18af5a 100644 Binary files a/Mage.Server/plugins/mage-player-human.jar and b/Mage.Server/plugins/mage-player-human.jar differ diff --git a/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java b/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java index d231ffddcf..226868f58a 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java +++ b/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java @@ -118,7 +118,7 @@ class MasterOfTheWildHuntEffect extends OneShotEffect<MasterOfTheWildHuntEffect> wolves.add(permanent.getId()); } Player player = game.getPlayer(target.getControllerId()); - player.assignDamage(target.getPower().getValue(), wolves, target.getId(), game); + player.assignDamage(target.getPower().getValue(), wolves, "Wolf", target.getId(), game); return true; } return false; diff --git a/Mage/src/mage/players/Player.java b/Mage/src/mage/players/Player.java index 625a6fdb3d..c0a14267df 100644 --- a/Mage/src/mage/players/Player.java +++ b/Mage/src/mage/players/Player.java @@ -159,7 +159,7 @@ public interface Player extends MageItem, Copyable<Player> { public abstract void selectAttackers(Game game); public abstract void selectBlockers(Game game); public abstract UUID chooseBlockerOrder(List<Permanent> blockers, Game game); - public abstract void assignDamage(int damage, List<UUID> targets, UUID sourceId, Game game); + public abstract void assignDamage(int damage, List<UUID> targets, String singleTargetName, UUID sourceId, Game game); public abstract int getAmount(int min, int max, String message, Game game); public abstract void sideboard(Match match, Deck deck); public abstract void construct(Tournament tournament, Deck deck);