From 0650cff105a5fec461168fbe3aa151b72a50aff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gunnar=20M=C3=A1r=20=C3=93ttarsson?= Date: Fri, 30 Aug 2019 22:20:26 +0000 Subject: [PATCH 1/3] updated DuelCommander ban list --- .../src/mage/deck/DuelCommander.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/DuelCommander.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/DuelCommander.java index f93d3fcf98..5f79f141be 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/DuelCommander.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/DuelCommander.java @@ -55,25 +55,28 @@ public class DuelCommander extends Commander { banned.add("The Tabernacle at Pendrell Vale"); banned.add("Time Vault"); banned.add("Time Walk"); + banned.add("Timetwister"); banned.add("Tinker"); banned.add("Tolarian Academy"); banned.add("Treasure Cruise"); banned.add("Vampiric Tutor"); + bannedCommander.add("Arahbo, Roar of the World"); bannedCommander.add("Breya, Etherium Shaper"); bannedCommander.add("Bruse Tarl, Boorish Herder"); bannedCommander.add("Derevi, Empyrial Tactician"); bannedCommander.add("Edgar Markov"); - bannedCommander.add("Edric, Spymaster of Trest"); - bannedCommander.add("Erayo, Soratami Ascendant"); bannedCommander.add("Geist of Saint Traft"); bannedCommander.add("Jace, Vryn's Prodigy"); bannedCommander.add("Marath, Will of the Wild"); + bannedCommander.add("Najeela, the Blade-Blossom"); bannedCommander.add("Oloro, Ageless Ascetic"); bannedCommander.add("Rofellos, Llanowar Emissary"); bannedCommander.add("Tasigur, the Golden Fang"); + bannedCommander.add("Teferi, Temporal Archmage"); + bannedCommander.add("Urza, Lord High Artificer"); bannedCommander.add("Vial Smasher the Fierce"); - bannedCommander.add("Zur the Enchanter"); + bannedCommander.add("Yuriko, the Tiger’s Shadow"); bannedCommander.add("Zurgo Bellstriker"); } From f8e5a65d85f4c551568bb81dc3d1ff26e03fb143 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Fri, 30 Aug 2019 20:58:40 -0400 Subject: [PATCH 2/3] fixed Kethis, the Hidden Hand giving abilities to cards not in the graveyard when its ability resolved (fixes #5950) --- .../src/mage/cards/k/KethisTheHiddenHand.java | 34 +++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/cards/k/KethisTheHiddenHand.java b/Mage.Sets/src/mage/cards/k/KethisTheHiddenHand.java index 8db1f2d43a..bb1d5204f3 100644 --- a/Mage.Sets/src/mage/cards/k/KethisTheHiddenHand.java +++ b/Mage.Sets/src/mage/cards/k/KethisTheHiddenHand.java @@ -1,6 +1,7 @@ package mage.cards.k; import mage.MageInt; +import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -75,24 +76,43 @@ class KethisTheHiddenHandEffect extends ContinuousEffectImpl { super(effect); } + @Override + public void init(Ability source, Game game) { + super.init(source, game); + if (!this.affectedObjectsSet) { + return; + } + Player player = game.getPlayer(source.getControllerId()); + if (player == null) { + return; + } + player.getGraveyard() + .stream() + .map(game::getCard) + .filter(Card::isLegendary) + .forEach(card -> affectedObjectList.add(new MageObjectReference(card, game))); + } + @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller == null) { return false; } - for (UUID cardId : controller.getGraveyard()) { - Card card = game.getCard(cardId); - if (card == null || !card.isLegendary()) { - continue; - } + controller.getGraveyard() + .getCards(game) + .stream() + .filter(card -> affectedObjectList + .stream() + .anyMatch(mor -> mor.refersTo(card, game)) + ).forEach(card -> { Ability ability = new SimpleStaticAbility( Zone.GRAVEYARD, new KethisTheHiddenHandGraveyardEffect() ); - ability.setSourceId(cardId); + ability.setSourceId(card.getId()); ability.setControllerId(card.getOwnerId()); game.getState().addOtherAbility(card, ability); - } + }); return true; } From 7eb51050522730c99fd11a19e34e256fe0c5df5f Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Fri, 30 Aug 2019 21:02:57 -0400 Subject: [PATCH 3/3] updated Aus Highlander point list --- .../Mage.Deck.Constructed/src/mage/deck/AusHighlander.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AusHighlander.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AusHighlander.java index 35a79d924d..574bfec565 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AusHighlander.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AusHighlander.java @@ -46,6 +46,7 @@ public class AusHighlander extends Constructed { pointMap.put("Dark Petition", 1); pointMap.put("Enlightened Tutor", 1); pointMap.put("Fastbond", 1); + pointMap.put("Flash", 1); pointMap.put("Force of Will", 1); pointMap.put("Green Sun's Zenith", 1); pointMap.put("Hermit Druid", 1);