From 35e4e580fa6da91ce8b4bca0f74123e011574057 Mon Sep 17 00:00:00 2001
From: tool4ever <therealtoolkit@hotmail.com>
Date: Sat, 26 Jul 2025 14:09:09 +0200
Subject: [PATCH] Cleanup duplicated field (#8217)

---
 .../src/main/java/forge/game/spellability/SpellAbility.java | 6 +-----
 .../src/main/java/forge/game/trigger/TriggerHandler.java    | 1 -
 .../src/main/java/forge/game/trigger/WrappedAbility.java    | 5 -----
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
index 70e9da92c9f..b40c225a71e 100644
--- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
+++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
@@ -114,7 +114,6 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
     private Trigger triggerObj;
     private boolean optionalTrigger = false;
     private ReplacementEffect replacementEffect;
-    private int sourceTrigger = -1;
     private List<Object> triggerRemembered = Lists.newArrayList();
 
     private AlternativeCost altCost = null;
@@ -1347,10 +1346,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
     }
 
     public int getSourceTrigger() {
-        return sourceTrigger;
-    }
-    public void setSourceTrigger(final int id) {
-        sourceTrigger = id;
+        return isTrigger() ? getTrigger().getId() : -1;
     }
 
     public boolean isReplacementAbility() {
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
index a8113c9e8c7..22f75c37f9a 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
@@ -518,7 +518,6 @@ public class TriggerHandler {
         }
 
         sa.setTrigger(regtrig);
-        sa.setSourceTrigger(regtrig.getId());
         regtrig.setTriggeringObjects(sa, runParams);
         sa.setTriggerRemembered(regtrig.getTriggerRemembered());
 
diff --git a/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java b/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java
index c2d41033abe..f67650e8c7d 100644
--- a/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java
+++ b/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java
@@ -364,11 +364,6 @@ public class WrappedAbility extends Ability {
         sa.setTargetCard(card);
     }
 
-    @Override
-    public void setSourceTrigger(final int id) {
-        sa.setSourceTrigger(id);
-    }
-
     @Override
     public int getSourceTrigger() {
         return sa.getSourceTrigger();