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

Merge branch 'activation' into 'master'

Browse Source 
ActivationTable: Fix NPE for triggers without OverridingAbility

Closes #1859

See merge request core-developers/forge!4799
This commit is contained in:
Michael Kamensky
2021-06-03 14:07:15 +00:00
parent bbf1e373ad 80e8f5db8a
commit f08cb0f0b5
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/game/card/ActivationTable.java
View File

@@ -34,10 +34,13 @@ public class ActivationTable extends ForwardingTable<SpellAbility, Optional<Stat
public void add(SpellAbility sa) { public void add(SpellAbility sa) {
SpellAbility root = sa.getRootAbility(); SpellAbility root = sa.getRootAbility();
SpellAbility original = getOriginal(sa); SpellAbility original = getOriginal(sa);
if (original != null) {
Optional<StaticAbility> st = Optional.fromNullable(root.getGrantorStatic()); Optional<StaticAbility> st = Optional.fromNullable(root.getGrantorStatic());
delegate().put(original, st, ObjectUtils.defaultIfNull(get(original, st), 0) + 1); delegate().put(original, st, ObjectUtils.defaultIfNull(get(original, st), 0) + 1);
} }
}
public Integer get(SpellAbility sa) { public Integer get(SpellAbility sa) {
SpellAbility root = sa.getRootAbility(); SpellAbility root = sa.getRootAbility();

3
forge-gui/res/cardsfolder/g/goblin_artisans.txt
View File

@@ -2,7 +2,8 @@ Name:Goblin Artisans
ManaCost:R ManaCost:R
Types:Creature Goblin Artificer Types:Creature Goblin Artificer
PT:1/1 PT:1/1
T:Mode$ ChangesZone | Static$ True | ValidCard$ Artifact.YouCtrl | Origin$ Any | Destination$ Stack | RememberTriggeringCard T:Mode$ ChangesZone | Static$ True | ValidCard$ Artifact.YouCtrl | Origin$ Any | Destination$ Stack | Execute$ DBRemember
SVar:DBRemember:DB$ Pump | RememberObjects$ TriggeredCard
T:Mode$ BecomesTarget | Static$ True | ValidSource$ Card.Other+namedGoblin Artisans | ValidTarget$ Spell | Execute$ DBForget T:Mode$ BecomesTarget | Static$ True | ValidSource$ Card.Other+namedGoblin Artisans | ValidTarget$ Spell | Execute$ DBForget
SVar:DBForget:DB$ Cleanup | ForgetDefined$ TriggeredTargetHostCard SVar:DBForget:DB$ Cleanup | ForgetDefined$ TriggeredTargetHostCard
T:Mode$ ChangesZone | Static$ True | ValidCard$ Artifact.YouCtrl+IsRemembered | Origin$ Stack | Destination$ Any | Execute$ DBCleanup T:Mode$ ChangesZone | Static$ True | ValidCard$ Artifact.YouCtrl+IsRemembered | Origin$ Stack | Destination$ Any | Execute$ DBCleanup