From b2d8c12ca33ae1d7202fba9b7236a49e7cf0d5f9 Mon Sep 17 00:00:00 2001
From: jmlundeen <jmlundee@yahoo.com>
Date: Thu, 24 Apr 2025 10:51:17 -0500
Subject: [PATCH] Fix Sigurd, Jarl of Ravensthorpe last ability trigger

* Didn't trigger on entering sagas
* Was checking for P1P1 counters
---
 .../cards/s/SigurdJarlOfRavensthorpe.java     |  5 +-
 .../acr/SigurdJarlOfRavensthorpeTest.java     | 54 +++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/single/acr/SigurdJarlOfRavensthorpeTest.java

diff --git a/Mage.Sets/src/mage/cards/s/SigurdJarlOfRavensthorpe.java b/Mage.Sets/src/mage/cards/s/SigurdJarlOfRavensthorpe.java
index 8e8800bbf03..d601a1f99ea 100644
--- a/Mage.Sets/src/mage/cards/s/SigurdJarlOfRavensthorpe.java
+++ b/Mage.Sets/src/mage/cards/s/SigurdJarlOfRavensthorpe.java
@@ -128,10 +128,13 @@ class SigurdJarlOfRavensthorpeTriggeredAbility extends TriggeredAbilityImpl {
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
         Permanent permanent = game.getPermanent(event.getTargetId());
+        if (permanent == null) {
+            permanent = game.getPermanentEntering(event.getTargetId());
+        }
         return permanent != null
                 && permanent.hasSubtype(SubType.SAGA, game)
                 && permanent.isControlledBy(getControllerId())
-                && CounterType.P1P1.getName().equals(event.getData())
+                && CounterType.LORE.getName().equals(event.getData())
                 && isControlledBy(event.getPlayerId());
     }
 }
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/acr/SigurdJarlOfRavensthorpeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/acr/SigurdJarlOfRavensthorpeTest.java
new file mode 100644
index 00000000000..2dd6b577e64
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/acr/SigurdJarlOfRavensthorpeTest.java
@@ -0,0 +1,54 @@
+package org.mage.test.cards.single.acr;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import mage.counters.CounterType;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+public class SigurdJarlOfRavensthorpeTest extends CardTestPlayerBase {
+
+    /**
+     * Whenever you put a lore counter on a Saga you control, put a +1/+1 counter on up to one other target creature.
+     * Boast -- {1}: Put a lore counter on target Saga you control or remove one from it.
+     */
+    private static final String sigurd = "Sigurd, Jarl of Ravensthorpe";
+    /**
+     * Saga land
+     */
+    private static final String saga = "Urza's Saga";
+    /**
+     * 2/2 Green Creature
+     */
+    private static final String bear = "Bear Cub";
+
+    @Test
+    public void testSigurd() {
+        setStrictChooseMode(true);
+        addCard(Zone.BATTLEFIELD, playerA, sigurd);
+        addCard(Zone.BATTLEFIELD, playerA, bear);
+        addCard(Zone.HAND, playerA, saga);
+        addCard(Zone.BATTLEFIELD, playerA, "Forest");
+
+        // Saga entering triggers
+        playLand(1, PhaseStep.PRECOMBAT_MAIN,playerA, saga);
+        addTarget(playerA, bear);
+        setChoice(playerA, "I - {this} gains"); // Stack Sigurd ability last
+        waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
+        checkPermanentCounters("Saga entering counter", 1, PhaseStep.PRECOMBAT_MAIN, playerA, saga, CounterType.LORE, 1);
+        checkPermanentCounters("Bear cub single counter", 1, PhaseStep.PRECOMBAT_MAIN, playerA, bear, CounterType.P1P1, 1);
+
+        // Activate boast
+        attack(1, playerA, sigurd);
+        activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Boast &mdash; {1}: ", saga);
+        setChoice(playerA, true); // add counter
+        setChoice(playerA, "II - {this} gains"); // Stack Sigurd ability last
+        addTarget(playerA, bear);
+        waitStackResolved(1, PhaseStep.POSTCOMBAT_MAIN);
+        checkPermanentCounters("Saga boast counter", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, saga, CounterType.LORE, 2);
+        checkPermanentCounters("Bear cub two counters", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, bear, CounterType.P1P1, 2);
+
+        setStopAt(1, PhaseStep.END_TURN);
+        execute();
+    }
+}
\ No newline at end of file