From 03c766a4856c9273b8bcabdac57f681f4b53ae8a Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 19 Nov 2016 23:12:02 +0100 Subject: [PATCH] * Myriad - Fixed a bug that the token was also created to attack the definding player. --- .../src/mage/player/human/HumanPlayer.java | 9 ++++++++- .../main/java/mage/abilities/keyword/MyriadAbility.java | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) 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 06767728750..4325ca696f2 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 @@ -1059,7 +1059,14 @@ public class HumanPlayer extends PlayerImpl { } } if (chooseTarget(Outcome.Damage, target, null, game)) { - declareAttacker(attackerId, response.getUUID(), game, true); + UUID defenderId = response.getUUID(); + for (Player player : game.getPlayers().values()) { + if (player.getId().equals(response.getUUID())) { + defenderId = player.getId(); // get the correct player object + break; + } + } + declareAttacker(attackerId, defenderId, game, true); return true; } } diff --git a/Mage/src/main/java/mage/abilities/keyword/MyriadAbility.java b/Mage/src/main/java/mage/abilities/keyword/MyriadAbility.java index 01962f97879..8fc0d734e3e 100644 --- a/Mage/src/main/java/mage/abilities/keyword/MyriadAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/MyriadAbility.java @@ -98,7 +98,7 @@ class MyriadEffect extends OneShotEffect { } List tokens = new ArrayList<>(); for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) { - if (playerId != defendingPlayerId && controller.hasOpponent(playerId, game)) { + if (!playerId.equals(defendingPlayerId) && controller.hasOpponent(playerId, game)) { Player opponent = game.getPlayer(playerId); if (opponent != null && controller.chooseUse(Outcome.PutCreatureInPlay, "Put a copy of " + sourceObject.getIdName() + " onto battlefield attacking " + opponent.getName() + "?", source, game)) {