From 65f400cf46dadacd5e2aaba35d89471f8cea585d Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Sun, 30 May 2021 18:32:03 +0200 Subject: [PATCH 1/3] Fix NPE --- .../src/main/java/forge/game/card/ActivationTable.java | 7 +++++-- forge-gui/res/cardsfolder/g/goblin_artisans.txt | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/ActivationTable.java b/forge-game/src/main/java/forge/game/card/ActivationTable.java index 90b2adf640e..b292e5b2205 100644 --- a/forge-game/src/main/java/forge/game/card/ActivationTable.java +++ b/forge-game/src/main/java/forge/game/card/ActivationTable.java @@ -34,9 +34,12 @@ public class ActivationTable extends ForwardingTable st = Optional.fromNullable(root.getGrantorStatic()); - delegate().put(original, st, ObjectUtils.defaultIfNull(get(original, st), 0) + 1); + if (original != null) { + Optional st = Optional.fromNullable(root.getGrantorStatic()); + + delegate().put(original, st, ObjectUtils.defaultIfNull(get(original, st), 0) + 1); + } } public Integer get(SpellAbility sa) { diff --git a/forge-gui/res/cardsfolder/g/goblin_artisans.txt b/forge-gui/res/cardsfolder/g/goblin_artisans.txt index e0f85b739a0..ff91c655246 100644 --- a/forge-gui/res/cardsfolder/g/goblin_artisans.txt +++ b/forge-gui/res/cardsfolder/g/goblin_artisans.txt @@ -2,7 +2,7 @@ Name:Goblin Artisans ManaCost:R Types:Creature Goblin Artificer 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 | RememberTriggeringCard$ True T:Mode$ BecomesTarget | Static$ True | ValidSource$ Card.Other+namedGoblin Artisans | ValidTarget$ Spell | Execute$ DBForget SVar:DBForget:DB$ Cleanup | ForgetDefined$ TriggeredTargetHostCard T:Mode$ ChangesZone | Static$ True | ValidCard$ Artifact.YouCtrl+IsRemembered | Origin$ Stack | Destination$ Any | Execute$ DBCleanup From 6ab9bfa0fa57db1c1472dd6fbc873c08b0dd3b26 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Tue, 1 Jun 2021 22:33:49 +0200 Subject: [PATCH 2/3] Add pump --- forge-gui/res/cardsfolder/g/goblin_artisans.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/g/goblin_artisans.txt b/forge-gui/res/cardsfolder/g/goblin_artisans.txt index ff91c655246..64a8b7978e6 100644 --- a/forge-gui/res/cardsfolder/g/goblin_artisans.txt +++ b/forge-gui/res/cardsfolder/g/goblin_artisans.txt @@ -2,7 +2,8 @@ Name:Goblin Artisans ManaCost:R Types:Creature Goblin Artificer PT:1/1 -T:Mode$ ChangesZone | Static$ True | ValidCard$ Artifact.YouCtrl | Origin$ Any | Destination$ Stack | RememberTriggeringCard$ True +T:Mode$ ChangesZone | Static$ True | ValidCard$ Artifact.YouCtrl | Origin$ Any | Destination$ Stack +SVar:DBRemember:DB$ Pump | RememberObjects$ TriggeredCard T:Mode$ BecomesTarget | Static$ True | ValidSource$ Card.Other+namedGoblin Artisans | ValidTarget$ Spell | Execute$ DBForget SVar:DBForget:DB$ Cleanup | ForgetDefined$ TriggeredTargetHostCard T:Mode$ ChangesZone | Static$ True | ValidCard$ Artifact.YouCtrl+IsRemembered | Origin$ Stack | Destination$ Any | Execute$ DBCleanup From 80e8f5db8ace4153ef7a3c5aa892fc73c3750d8f Mon Sep 17 00:00:00 2001 From: Bug Hunter Date: Wed, 2 Jun 2021 06:51:46 +0000 Subject: [PATCH 3/3] Update goblin_artisans.txt --- forge-gui/res/cardsfolder/g/goblin_artisans.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/g/goblin_artisans.txt b/forge-gui/res/cardsfolder/g/goblin_artisans.txt index 64a8b7978e6..cd12095301f 100644 --- a/forge-gui/res/cardsfolder/g/goblin_artisans.txt +++ b/forge-gui/res/cardsfolder/g/goblin_artisans.txt @@ -2,7 +2,7 @@ Name:Goblin Artisans ManaCost:R Types:Creature Goblin Artificer PT:1/1 -T:Mode$ ChangesZone | Static$ True | ValidCard$ Artifact.YouCtrl | Origin$ Any | Destination$ Stack +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 SVar:DBForget:DB$ Cleanup | ForgetDefined$ TriggeredTargetHostCard