From b2d045e4f2c5337ddf723b96eae5fd094d9a9bf6 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Sun, 14 May 2023 18:40:13 +0800 Subject: [PATCH] fix quest completed crash -remove duplicate reward --- .../src/forge/adventure/util/RewardActor.java | 9 ++++++--- forge-gui/res/adventure/Shandalar/world/quests.json | 8 -------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/forge-gui-mobile/src/forge/adventure/util/RewardActor.java b/forge-gui-mobile/src/forge/adventure/util/RewardActor.java index 9bd3dd0cabc..e46865ce613 100644 --- a/forge-gui-mobile/src/forge/adventure/util/RewardActor.java +++ b/forge-gui-mobile/src/forge/adventure/util/RewardActor.java @@ -616,7 +616,8 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb public void removeTooltip() { if (tooltip != null) { - tooltip.getActor().remove(); + if (tooltip.getActor() != null) + tooltip.getActor().remove(); } } @@ -934,8 +935,10 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb } public void hide() { - tooltip_actor.remove(); - switchButton.remove(); + if (tooltip_actor != null) + tooltip_actor.remove(); + if (switchButton != null) + switchButton.remove(); shown = false; } } diff --git a/forge-gui/res/adventure/Shandalar/world/quests.json b/forge-gui/res/adventure/Shandalar/world/quests.json index 6df26fe13cb..b7c743ca2f3 100644 --- a/forge-gui/res/adventure/Shandalar/world/quests.json +++ b/forge-gui/res/adventure/Shandalar/world/quests.json @@ -2639,14 +2639,6 @@ "options": [ { "action": [ - { - "grantRewards": [ - { - "type": "shards", - "count": 15 - } - ] - }, { "grantRewards": [ {