Merge pull request #2808 from kevlahnota/newmaster2

SpellSmithScene filter upcoming
This commit is contained in:
Anthony Calosa
2023-04-02 07:41:47 +08:00
committed by GitHub

View File

@@ -19,6 +19,8 @@ import forge.item.PaperCard;
import forge.model.FModel; import forge.model.FModel;
import forge.util.MyRandom; import forge.util.MyRandom;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.StreamSupport; import java.util.stream.StreamSupport;
@@ -140,6 +142,11 @@ public class SpellSmithScene extends UIScene {
return false; return false;
if (input.getType() == CardEdition.Type.REPRINT || input.getType() == CardEdition.Type.PROMO || input.getType() == CardEdition.Type.COLLECTOR_EDITION) if (input.getType() == CardEdition.Type.REPRINT || input.getType() == CardEdition.Type.PROMO || input.getType() == CardEdition.Type.COLLECTOR_EDITION)
return false; return false;
if (input.getDate() != null) {
Instant now = Instant.now(); //this should filter upcoming sets from release date + 1 day..
if (input.getDate().after(Date.from(now.minus(1, ChronoUnit.DAYS))))
return false;
}
List<PaperCard> it = StreamSupport.stream(RewardData.getAllCards().spliterator(), false) List<PaperCard> it = StreamSupport.stream(RewardData.getAllCards().spliterator(), false)
.filter(input2 -> input2.getEdition().equals(input.getCode())).collect(Collectors.toList()); .filter(input2 -> input2.getEdition().equals(input.getCode())).collect(Collectors.toList());
if (it.size() == 0) if (it.size() == 0)