From 527997f5b22f7e6940d69e7a3de2b997fd15a1b9 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Tue, 19 Apr 2022 21:54:14 +0800
Subject: [PATCH] Update RewardData - exclude Online and Funny Card for
 Adventure Rewards

---
 forge-core/src/main/java/forge/card/CardDb.java | 17 +++++++++++++++++
 .../src/forge/adventure/data/RewardData.java    |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/forge-core/src/main/java/forge/card/CardDb.java b/forge-core/src/main/java/forge/card/CardDb.java
index ce2a857ca44..4838a3aa551 100644
--- a/forge-core/src/main/java/forge/card/CardDb.java
+++ b/forge-core/src/main/java/forge/card/CardDb.java
@@ -872,6 +872,23 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
         }));
     }
 
+    public Collection<PaperCard> getUniqueCardsNoAltNoOnline() {
+        return Lists.newArrayList(Iterables.filter(getUniqueCardsNoAlt(), new Predicate<PaperCard>() {
+            @Override
+            public boolean apply(final PaperCard paperCard) {
+                CardEdition edition = null;
+                try {
+                    edition = editions.getEditionByCodeOrThrow(paperCard.getEdition());
+                    if (edition.getType() == Type.ONLINE||edition.getType() == Type.FUNNY)
+                        return false;
+                } catch (Exception ex) {
+                    return false;
+                }
+                return true;
+            }
+        }));
+    }
+
     public Collection<PaperCard> getAllNonPromosNonReprintsNoAlt() {
         return Lists.newArrayList(Iterables.filter(getAllCardsNoAlt(), new Predicate<PaperCard>() {
             @Override
diff --git a/forge-gui-mobile/src/forge/adventure/data/RewardData.java b/forge-gui-mobile/src/forge/adventure/data/RewardData.java
index 297dfe08e0f..a7cbdc98d90 100644
--- a/forge-gui-mobile/src/forge/adventure/data/RewardData.java
+++ b/forge-gui-mobile/src/forge/adventure/data/RewardData.java
@@ -78,11 +78,11 @@ public class RewardData {
             RewardData legals=Config.instance().getConfigData().legalCards;
             if(legals==null)
             {
-                allCards = FModel.getMagicDb().getCommonCards().getUniqueCardsNoAlt();
+                allCards = FModel.getMagicDb().getCommonCards().getUniqueCardsNoAltNoOnline();
             }
             else
             {
-                allCards = Iterables.filter(FModel.getMagicDb().getCommonCards().getUniqueCardsNoAlt(),  new CardUtil.CardPredicate(legals, true));
+                allCards = Iterables.filter(FModel.getMagicDb().getCommonCards().getUniqueCardsNoAltNoOnline(),  new CardUtil.CardPredicate(legals, true));
             }
             allEnemyCards=Iterables.filter(allCards, new Predicate<PaperCard>() {
                 @Override