From 50434304817b1c0d44bb4badf0a7157e74e6f91b Mon Sep 17 00:00:00 2001
From: PurpleCrowbar <26198472+PurpleCrowbar@users.noreply.github.com>
Date: Tue, 30 Jul 2024 03:18:36 +0100
Subject: [PATCH] Fixes to Wick and Communal Brewing

---
 Mage.Sets/src/mage/cards/c/CommunalBrewing.java    |  6 +-----
 Mage.Sets/src/mage/cards/w/WickTheWhorledMind.java | 10 +++++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/c/CommunalBrewing.java b/Mage.Sets/src/mage/cards/c/CommunalBrewing.java
index b0258bc6ec4..1ea3d970642 100644
--- a/Mage.Sets/src/mage/cards/c/CommunalBrewing.java
+++ b/Mage.Sets/src/mage/cards/c/CommunalBrewing.java
@@ -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());
diff --git a/Mage.Sets/src/mage/cards/w/WickTheWhorledMind.java b/Mage.Sets/src/mage/cards/w/WickTheWhorledMind.java
index d5a585d7055..1b53ebd8f85 100644
--- a/Mage.Sets/src/mage/cards/w/WickTheWhorledMind.java
+++ b/Mage.Sets/src/mage/cards/w/WickTheWhorledMind.java
@@ -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);