From 7eec98db614183fc3af9462cacde40d2fb91db0c Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Mon, 26 Jul 2021 20:37:59 +0200
Subject: [PATCH] Fix CostSacrifice OriginalHost

---
 forge-ai/src/main/java/forge/ai/AiCostDecision.java    |  3 +--
 .../src/main/java/forge/game/card/CardLists.java       | 10 +++++-----
 forge-gui/res/cardsfolder/t/tricksters_talisman.txt    |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/AiCostDecision.java b/forge-ai/src/main/java/forge/ai/AiCostDecision.java
index 2126230fedb..ea131c2598d 100644
--- a/forge-ai/src/main/java/forge/ai/AiCostDecision.java
+++ b/forge-ai/src/main/java/forge/ai/AiCostDecision.java
@@ -484,7 +484,7 @@ public class AiCostDecision extends CostDecisionMakerBase {
             return PaymentDecision.card(source);
         }
         if (cost.getType().equals("OriginalHost")) {
-            return PaymentDecision.card(ability.getHostCard());
+            return PaymentDecision.card(ability.getOriginalHost());
         }
         if (cost.getAmount().equals("All")) {
             // Does the AI want to use Sacrifice All?
@@ -600,7 +600,6 @@ public class AiCostDecision extends CostDecisionMakerBase {
         // currently if amount is bigger than one,
         // it tries to remove all counters from one source and type at once
 
-
         int toRemove = 0;
         final GameEntityCounterTable table = new GameEntityCounterTable();
 
diff --git a/forge-game/src/main/java/forge/game/card/CardLists.java b/forge-game/src/main/java/forge/game/card/CardLists.java
index ca04608085e..093010da07d 100644
--- a/forge-game/src/main/java/forge/game/card/CardLists.java
+++ b/forge-game/src/main/java/forge/game/card/CardLists.java
@@ -122,7 +122,7 @@ public class CardLists {
      */
     public static void sortByCmcDesc(final List<Card> list) {
         Collections.sort(list, CmcComparatorInv);
-    } // sortByCmcDesc
+    }
 
     /**
      * <p>
@@ -133,7 +133,7 @@ public class CardLists {
      */
     public static void sortByToughnessAsc(final List<Card> list) {
         Collections.sort(list, ToughnessComparator);
-    } // sortByToughnessAsc()
+    }
 
     /**
      * <p>
@@ -144,7 +144,7 @@ public class CardLists {
      */
     public static void sortByToughnessDesc(final List<Card> list) {
         Collections.sort(list, ToughnessComparatorInv);
-    } // sortByToughnessDesc()
+    }
 
     /**
      * <p>
@@ -155,7 +155,7 @@ public class CardLists {
      */
     public static void sortByPowerAsc(final List<Card> list) {
         Collections.sort(list, PowerComparator);
-    } // sortAttackLowFirst()
+    }
 
     // the higher the attack the better
     /**
@@ -167,7 +167,7 @@ public class CardLists {
      */
     public static void sortByPowerDesc(final List<Card> list) {
         Collections.sort(list, Collections.reverseOrder(PowerComparator));
-    } // sortAttack()
+    }
 
 
     /**
diff --git a/forge-gui/res/cardsfolder/t/tricksters_talisman.txt b/forge-gui/res/cardsfolder/t/tricksters_talisman.txt
index f84dfbd654f..f36e97112c6 100644
--- a/forge-gui/res/cardsfolder/t/tricksters_talisman.txt
+++ b/forge-gui/res/cardsfolder/t/tricksters_talisman.txt
@@ -4,6 +4,6 @@ Types:Artifact Equipment
 K:Equip:2
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1  | AddToughness$ 1 | AddTrigger$ AttackTrigger | Description$ Invoke Duplicity — Equipped creature gets +1/+1 and has "Whenever this creature deals combat damage to a player, you may sacrifice CARDNAME. If you do, create a token that's a copy of this creature."
 SVar:AttackTrigger:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever this creature deals combat damage to a player, you may sacrifice Trickster's Talisman. If you do, create a token that's a copy of this creature.
-SVar:TrigCopy:AB$ CopyPermanent | Cost$ Sac<1/OriginalHost/Trickster's Talisman> | Defined$ Self | NumCopies$ 1 | AILogic$ DuplicatePerms
+SVar:TrigCopy:AB$ CopyPermanent | Cost$ Sac<1/OriginalHost/Trickster's Talisman> | Defined$ Self | NumCopies$ 1
 DeckHas:Ability$Token
 Oracle:Invoke Duplicity — Equipped creature gets +1/+1 and has "Whenever this creature deals combat damage to a player, you may sacrifice Trickster's Talisman. If you do, create a token that's a copy of this creature."\nEquip {2}