From ad218ee1f0aa0a61426f66b64dc3da17b48e6b3a Mon Sep 17 00:00:00 2001
From: Bug Hunter <therealtoolkit@hotmail.com>
Date: Fri, 26 Feb 2021 15:01:46 +0000
Subject: [PATCH] Fix sacrifice cost with blockedBy target

---
 forge-game/src/main/java/forge/game/card/CardProperty.java | 2 ++
 forge-gui/res/cardsfolder/t/tinder_wall.txt                | 2 +-
 forge-gui/res/cardsfolder/w/wall_of_corpses.txt            | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/card/CardProperty.java b/forge-game/src/main/java/forge/game/card/CardProperty.java
index 246aaa80fd8..2231323b1b9 100644
--- a/forge-game/src/main/java/forge/game/card/CardProperty.java
+++ b/forge-game/src/main/java/forge/game/card/CardProperty.java
@@ -1533,6 +1533,8 @@ public class CardProperty {
         // Nex predicates refer to past combat and don't need a reference to actual combat
         else if (property.equals("blocked")) {
             return null != combat && combat.isBlocked(card);
+        } else if (property.startsWith("blockedBySourceLKI")) {
+            return null != combat && combat.isBlocking(game.getChangeZoneLKIInfo(source), card);
         } else if (property.startsWith("blockedBySource")) {
             return null != combat && combat.isBlocking(source, card);
         } else if (property.startsWith("blockedThisTurn")) {
diff --git a/forge-gui/res/cardsfolder/t/tinder_wall.txt b/forge-gui/res/cardsfolder/t/tinder_wall.txt
index f9c97f47c36..5dbe98ce107 100644
--- a/forge-gui/res/cardsfolder/t/tinder_wall.txt
+++ b/forge-gui/res/cardsfolder/t/tinder_wall.txt
@@ -4,7 +4,7 @@ Types:Creature Plant Wall
 PT:0/3
 K:Defender
 A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ R | Amount$ 2 | SpellDescription$ Add {R}{R}.
-A:AB$ DealDamage | Cost$ R Sac<1/CARDNAME> | ValidTgts$ Creature.blockedBySource | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature it's blocking.
+A:AB$ DealDamage | Cost$ R Sac<1/CARDNAME> | ValidTgts$ Creature.blockedBySourceLKI | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature it's blocking.
 AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tinder_wall.jpg
 Oracle:Defender (This creature can't attack.)\nSacrifice Tinder Wall: Add {R}{R}.\n{R}, Sacrifice Tinder Wall: It deals 2 damage to target creature it's blocking.
diff --git a/forge-gui/res/cardsfolder/w/wall_of_corpses.txt b/forge-gui/res/cardsfolder/w/wall_of_corpses.txt
index c9e70b1595b..c3c0ffb4190 100644
--- a/forge-gui/res/cardsfolder/w/wall_of_corpses.txt
+++ b/forge-gui/res/cardsfolder/w/wall_of_corpses.txt
@@ -3,6 +3,6 @@ ManaCost:1 B
 Types:Creature Wall
 PT:0/2
 K:Defender
-A:AB$ Destroy | Cost$ B Sac<1/CARDNAME> | ValidTgts$ Creature.blockedBySource | TgtPrompt$ Select target creature Wall of Corpses is blocking | SpellDescription$ Destroy target creature CARDNAME is blocking.
+A:AB$ Destroy | Cost$ B Sac<1/CARDNAME> | ValidTgts$ Creature.blockedBySourceLKI | TgtPrompt$ Select target creature Wall of Corpses is blocking | SpellDescription$ Destroy target creature CARDNAME is blocking.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wall_of_corpses.jpg
 Oracle:Defender (This creature can't attack.)\n{B}, Sacrifice Wall of Corpses: Destroy target creature Wall of Corpses is blocking.