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

Merge remote-tracking branch 'upstream/master' into formats/premodern

Browse Source
This commit is contained in:
Valerio Maggio
2023-05-14 16:38:25 +01:00
parent 7ffd495335 a90b379ef4
commit e94069cfd5
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui-mobile/src/forge/adventure/util/RewardActor.java
View File

@@ -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;
}
}

8
forge-gui/res/adventure/Shandalar/world/quests.json
View File

@@ -2639,14 +2639,6 @@
"options": [
{
"action": [
{
"grantRewards": [
{
"type": "shards",
"count": 15
}
]
},
{
"grantRewards": [
{