external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 20:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup duplicated field (#8217)

Browse Source
This commit is contained in:
tool4ever
2025-07-26 14:09:09 +02:00
committed by GitHub
parent baab31d2e2
commit 35e4e580fa
3 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/spellability/SpellAbility.java
View File

@@ -114,7 +114,6 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
private Trigger triggerObj; private Trigger triggerObj;
private boolean optionalTrigger = false; private boolean optionalTrigger = false;
private ReplacementEffect replacementEffect; private ReplacementEffect replacementEffect;
private int sourceTrigger = -1;
private List<Object> triggerRemembered = Lists.newArrayList(); private List<Object> triggerRemembered = Lists.newArrayList();
private AlternativeCost altCost = null; private AlternativeCost altCost = null;
@@ -1347,10 +1346,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
} }
public int getSourceTrigger() { public int getSourceTrigger() {
return sourceTrigger; return isTrigger() ? getTrigger().getId() : -1;
}
public void setSourceTrigger(final int id) {
sourceTrigger = id;
} }
public boolean isReplacementAbility() { public boolean isReplacementAbility() {

1
forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
View File

@@ -518,7 +518,6 @@ public class TriggerHandler {
} }
sa.setTrigger(regtrig); sa.setTrigger(regtrig);
sa.setSourceTrigger(regtrig.getId());
regtrig.setTriggeringObjects(sa, runParams); regtrig.setTriggeringObjects(sa, runParams);
sa.setTriggerRemembered(regtrig.getTriggerRemembered()); sa.setTriggerRemembered(regtrig.getTriggerRemembered());

5
forge-game/src/main/java/forge/game/trigger/WrappedAbility.java
View File

@@ -364,11 +364,6 @@ public class WrappedAbility extends Ability {
sa.setTargetCard(card); sa.setTargetCard(card);
} }
@Override
public void setSourceTrigger(final int id) {
sa.setSourceTrigger(id);
}
@Override @Override
public int getSourceTrigger() { public int getSourceTrigger() {
return sa.getSourceTrigger(); return sa.getSourceTrigger();