From 7fda27cb7e20e982135a47e73137fcc394a24078 Mon Sep 17 00:00:00 2001
From: Alex Vasile <48962821+Alex-Vasile@users.noreply.github.com>
Date: Wed, 13 Jul 2022 21:38:26 -0400
Subject: [PATCH] [C21] Fix Combat Calligrapher trigger. Closes #8580.

---
 Mage.Sets/src/mage/cards/c/CombatCalligrapher.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/c/CombatCalligrapher.java b/Mage.Sets/src/mage/cards/c/CombatCalligrapher.java
index 8ba88c356c4..02d35a5df16 100644
--- a/Mage.Sets/src/mage/cards/c/CombatCalligrapher.java
+++ b/Mage.Sets/src/mage/cards/c/CombatCalligrapher.java
@@ -18,6 +18,8 @@ import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
 import mage.game.permanent.token.InklingToken;
+import mage.players.Player;
+import mage.target.targetpointer.FixedTarget;
 
 import java.util.UUID;
 
@@ -78,10 +80,14 @@ class CombatCalligrapherTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (!game.getOpponents(getControllerId()).contains(event.getTargetId())) {
+        Player attacker = game.getPlayer(event.getPlayerId());
+        Player defender = game.getPlayer(event.getTargetId());
+        if (!game.getOpponents(getControllerId()).contains(attacker.getId())
+                || !game.getOpponents(getControllerId()).contains(defender.getId())) {
             return false;
         }
-        getEffects().setValue("playerToAttack", event.getPlayerId());
+        getEffects().setValue("playerToAttack", defender.getId());
+        getEffects().setTargetPointer(new FixedTarget(attacker.getId()));
         return true;
     }