mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-12 00:38:44 +00:00
Add some extra checks for safety.
This commit is contained in:
@@ -197,7 +197,7 @@ public class AdventureEventData implements Serializable {
|
|||||||
ConfigData configData = Config.instance().getConfigData();
|
ConfigData configData = Config.instance().getConfigData();
|
||||||
Predicate<CardEdition> filter = CardEdition.Predicates.CAN_MAKE_BOOSTER;
|
Predicate<CardEdition> filter = CardEdition.Predicates.CAN_MAKE_BOOSTER;
|
||||||
|
|
||||||
if(configData.allowedEvents != null) {
|
if(configData.allowedEvents != null && configData.allowedEvents.length > 0) {
|
||||||
Set<String> allowedEvents = Set.of(configData.allowedEvents);
|
Set<String> allowedEvents = Set.of(configData.allowedEvents);
|
||||||
filter = filter.and(q -> allowedEvents.contains(q.getCode()));
|
filter = filter.and(q -> allowedEvents.contains(q.getCode()));
|
||||||
}
|
}
|
||||||
@@ -210,7 +210,7 @@ public class AdventureEventData implements Serializable {
|
|||||||
Set<String> restrictedEvents = Set.of(configData.restrictedEvents);
|
Set<String> restrictedEvents = Set.of(configData.restrictedEvents);
|
||||||
filter = filter.and((q) -> !restrictedEvents.contains(q.getCode()));
|
filter = filter.and((q) -> !restrictedEvents.contains(q.getCode()));
|
||||||
}
|
}
|
||||||
if (configData.allowedEditions != null) {
|
if (configData.allowedEditions != null && configData.allowedEditions.length > 0) {
|
||||||
Set<String> allowed = Set.of(configData.allowedEditions);
|
Set<String> allowed = Set.of(configData.allowedEditions);
|
||||||
filter = filter.and(q -> allowed.contains(q.getCode()));
|
filter = filter.and(q -> allowed.contains(q.getCode()));
|
||||||
} else if(configData.restrictedEditions != null) {
|
} else if(configData.restrictedEditions != null) {
|
||||||
|
|||||||
Reference in New Issue
Block a user