From 173da04c33ce8d935be6fc4fb95c4b4f618d316d Mon Sep 17 00:00:00 2001
From: Grath <1895280+Grath@users.noreply.github.com>
Date: Thu, 5 Jun 2025 23:45:02 -0400
Subject: [PATCH] Fix ChooseCreatureEffect when used with
 non-AsEntersBattlefield.

Zenos yae Galvus was not letting you choose a creature when it entered, because getPermanentEntering returned null due to Zenos already being in play.
---
 .../mage/abilities/effects/common/ChooseCreatureEffect.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Mage/src/main/java/mage/abilities/effects/common/ChooseCreatureEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ChooseCreatureEffect.java
index f3eba38d1c1..bcc3e11aa63 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ChooseCreatureEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ChooseCreatureEffect.java
@@ -48,6 +48,9 @@ public class ChooseCreatureEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         Permanent sourcePermanent = game.getPermanentEntering(source.getSourceId());
+        if (sourcePermanent == null) {
+            sourcePermanent = game.getPermanent(source.getSourceId());
+        }
         if (controller == null || sourcePermanent == null) {
             return false;
         }