From 3b90880fa3ed2623460cdac49c16c60a5481a45b Mon Sep 17 00:00:00 2001 From: Jeff Wadsworth Date: Tue, 7 Nov 2023 17:09:56 -0600 Subject: [PATCH] Fixed #11381 The rest of these types of cards need to be fixed as well. --- Mage.Sets/src/mage/cards/m/MagmaticChanneler.java | 6 ++++++ .../abilities/effects/common/ChooseCreatureTypeEffect.java | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/cards/m/MagmaticChanneler.java b/Mage.Sets/src/mage/cards/m/MagmaticChanneler.java index 9edc1582de8..030a72ea048 100644 --- a/Mage.Sets/src/mage/cards/m/MagmaticChanneler.java +++ b/Mage.Sets/src/mage/cards/m/MagmaticChanneler.java @@ -138,6 +138,12 @@ class MagmaticChannelerCastFromExileEffect extends AsThoughEffectImpl { @Override public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) { + Card theCard = game.getCard(objectId); + if (theCard == null) { + return false; + } + objectId = theCard.getMainCard().getId(); // for split cards/MDFC/Adventure cards + return source.isControlledBy(affectedControllerId) && mor.refersTo(objectId, game); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/ChooseCreatureTypeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ChooseCreatureTypeEffect.java index f9e1297a9f0..2294602ceba 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ChooseCreatureTypeEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ChooseCreatureTypeEffect.java @@ -61,9 +61,10 @@ public class ChooseCreatureTypeEffect extends OneShotEffect { } /** - * @param objectId sourceId the effect was exeuted under + * @param objectId sourceId the effect was executed under * @param game - * @param typePostfix special postfix if you want to store multiple choices from different effects + * @param typePostfix special postfix if you want to store multiple choices + * from different effects * @return */ public static SubType getChosenCreatureType(UUID objectId, Game game, String typePostfix) {