From 9933420f571adec2a85409aed014d74069a57976 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Wed, 27 May 2020 10:24:21 +0200
Subject: [PATCH] * Emerge Ability - Fixed that the creature to sacrifice had
 to be selcted twice.

---
 .../mage/abilities/keyword/EmergeAbility.java   | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java b/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java
index 75ef4762ba5..805c78ff469 100644
--- a/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java
@@ -2,7 +2,6 @@ package mage.abilities.keyword;
 
 import mage.Mana;
 import mage.abilities.SpellAbility;
-import mage.abilities.costs.common.SacrificeTargetCost;
 import mage.abilities.costs.mana.ManaCost;
 import mage.abilities.costs.mana.ManaCosts;
 import mage.abilities.mana.ManaOptions;
@@ -11,7 +10,6 @@ import mage.constants.Outcome;
 import mage.constants.SpellAbilityType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledCreaturePermanent;
-import mage.filter.predicate.mageobject.CardIdPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
@@ -92,11 +90,16 @@ public class EmergeAbility extends SpellAbility {
             TargetPermanent target = new TargetControlledCreaturePermanent(new FilterControlledCreaturePermanent("creature to sacrifice for emerge"));
             if (controller.choose(Outcome.Sacrifice, target, this.getSourceId(), game)) {
                 Permanent creature = game.getPermanent(target.getFirstTarget());
-                CardUtil.reduceCost(this, creature.getConvertedManaCost());
-                FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(creature.getLogName());
-                filter.add(new CardIdPredicate(creature.getId()));
-                this.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(filter)));
-                return super.activate(game, false);
+                if (creature != null) {
+                    CardUtil.reduceCost(this, creature.getConvertedManaCost());
+                    if (super.activate(game, false)) {
+                        if (creature.sacrifice(getSourceId(), game)) {
+                            return true;
+                        } else {
+                            activated = false;
+                        }
+                    }
+                }
             }
         }
         return false;