Fixing broken block definitions

This commit is contained in:
Christian 'ketura' McCarty
2024-06-01 13:22:40 -05:00
parent 48f7157b62
commit 3d73e415ea

View File

@@ -21,7 +21,9 @@ public class PlaySite implements EffectAppenderProducer {
@Override
public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException {
FieldUtils.validateAllowedFields(effectObject, "block", "filter", "number", "memorize", "player");
final SitesBlock block = FieldUtils.getBlock(effectObject.get("block"), "block");
final String blockString = FieldUtils.getString(effectObject.get("block"), "block");
final SitesBlock block = blockString != null ? SitesBlock.findBlock(blockString) : null;
final String filter = FieldUtils.getString(effectObject.get("filter"), "filter", "any");
final ValueSource valueSource = ValueResolver.resolveEvaluator(effectObject.get("number"), environment);
final String memorize = FieldUtils.getString(effectObject.get("memorize"), "memorize");