Fixes to Wick and Communal Brewing

This commit is contained in:
PurpleCrowbar 2024-07-30 03:18:36 +01:00
parent 4f90270fa1
commit 5043430481
2 changed files with 6 additions and 10 deletions

View file

@ -81,7 +81,7 @@ class CommunalBrewingEffect extends OneShotEffect {
}
count += opponent.drawCards(1, source, game); // Known issue with Teferi's Ageless Insight. See #12616
}
Permanent permanent = game.getPermanent(source.getSourceId());
Permanent permanent = source.getSourcePermanentIfItStillExists(game);
if (permanent == null) {
return false;
}
@ -123,10 +123,6 @@ class CommunalBrewingCountersEffect extends ReplacementEffectImpl {
if (permanent == null || creature == null) {
return false;
}
Spell spell = game.getSpellOrLKIStack(creature.getId());
if (spell == null) {
return false;
}
creature.addCounters(CounterType.P1P1.createInstance(
permanent.getCounters(game).getCount(CounterType.INGREDIENT)
), source.getControllerId(), source, game, event.getAppliedEffects());

View file

@ -14,8 +14,8 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.counters.CounterType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledPermanent;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.game.permanent.token.SnailToken;
@ -29,8 +29,8 @@ import java.util.UUID;
*/
public final class WickTheWhorledMind extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(SubType.RAT, "Rat");
private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent(SubType.SNAIL, "Snail");
private static final FilterPermanent filter = new FilterPermanent(SubType.RAT, "Rat");
private static final FilterPermanent filter2 = new FilterPermanent(SubType.SNAIL, "Snail");
public WickTheWhorledMind(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}");
@ -87,7 +87,7 @@ class WickTheWhorledMindEffect extends OneShotEffect {
if (controller == null) {
return false;
}
FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(SubType.SNAIL, "Snail");
FilterControlledPermanent filter = new FilterControlledPermanent(SubType.SNAIL, "Snail");
if (game.getBattlefield().contains(filter, source.getControllerId(), source, game, 1)) {
TargetPermanent target = new TargetPermanent(filter);