images: fixed wrong miss image message in card hints for dungeons and…

… other command objects (part of #12274);
magefree · Sep 20, 2024 · e1ab0be · e1ab0be
1 parent ff02322
commit e1ab0be
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/Mage.Common/src/main/java/mage/view/StackAbilityView.java b/Mage.Common/src/main/java/mage/view/StackAbilityView.java
@@ -32,7 +32,7 @@ public class StackAbilityView extends CardView {
 
     public StackAbilityView(Game game, StackAbility ability, String sourceName, MageObject sourceObject, CardView sourceView) {
         this.id = ability.getId();
-        this.mageObjectType = MageObjectType.ABILITY_STACK;
+        this.mageObjectType = sourceView.getMageObjectType().isUseTokensRepository() ? MageObjectType.ABILITY_STACK_FROM_TOKEN : MageObjectType.ABILITY_STACK_FROM_CARD;
         this.abilityType = ability.getStackAbility().getAbilityType();
         this.sourceCard = sourceView;
         this.sourceCard.setMageObjectType(mageObjectType);

diff --git a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
@@ -1126,17 +1126,10 @@ private void tryToPlayPriority(Game game) {
 
     private Permanent findPermanentWithAssert(PlayerAction action, Game game, Player player, String cardName) {
         for (Permanent perm : game.getBattlefield().getAllActivePermanents(player.getId())) {
-            // need by controller
-            if (!perm.getControllerId().equals(player.getId())) {
-                continue;
-            }
-
             // need by alias or by name
             if (!hasObjectTargetNameOrAlias(perm, cardName)) {
                 continue;
             }
-
-            // all fine
             return perm;
         }
         printStart(game, "Permanents of " + player.getName());

diff --git a/Mage/src/main/java/mage/constants/MageObjectType.java b/Mage/src/main/java/mage/constants/MageObjectType.java
@@ -43,7 +43,8 @@
  * @author LevelX2
  */
 public enum MageObjectType {
-    ABILITY_STACK("Ability on the Stack", false, false, false),
+    ABILITY_STACK_FROM_CARD("Ability on the Stack", false, false, false),
+    ABILITY_STACK_FROM_TOKEN("Ability on the Stack", false, false, true),
     CARD("Card", false, true, false),
     COPY_CARD("Copy of a Card", false, true, false),
     TOKEN("Token", true, true, true),