Fixed a crash caused by some cards that play cards from stacked (such as Flung into the Fray)
This commit is contained in:
@@ -25,13 +25,13 @@ public class PlayCardFromStacked implements EffectAppenderProducer {
|
|||||||
FieldUtils.validateAllowedFields(effectObject, "select", "on", "discount", "removedTwilight", "assumePlayable", "memorize");
|
FieldUtils.validateAllowedFields(effectObject, "select", "on", "discount", "removedTwilight", "assumePlayable", "memorize");
|
||||||
|
|
||||||
final String select = FieldUtils.getString(effectObject.get("select"), "select", "choose(any)");
|
final String select = FieldUtils.getString(effectObject.get("select"), "select", "choose(any)");
|
||||||
final String onFilter = FieldUtils.getString(effectObject.get("on"), "on");
|
final String onFilter = FieldUtils.getString(effectObject.get("on"), "on", "any");
|
||||||
final ValueSource costModifierSource = ValueResolver.resolveEvaluator(effectObject.get("discount"), 0, environment);
|
final ValueSource costModifierSource = ValueResolver.resolveEvaluator(effectObject.get("discount"), 0, environment);
|
||||||
final int removedTwilight = FieldUtils.getInteger(effectObject.get("removedTwilight"), "removedTwilight", 0);
|
final int removedTwilight = FieldUtils.getInteger(effectObject.get("removedTwilight"), "removedTwilight", 0);
|
||||||
final boolean assumePlayable = FieldUtils.getBoolean(effectObject.get("assumePlayable"), "assumePlayable", false);
|
final boolean assumePlayable = FieldUtils.getBoolean(effectObject.get("assumePlayable"), "assumePlayable", false);
|
||||||
final String memory = FieldUtils.getString(effectObject.get("memorize"), "memorize", "_temp");
|
final String memory = FieldUtils.getString(effectObject.get("memorize"), "memorize", "_temp");
|
||||||
|
|
||||||
final FilterableSource onFilterableSource = (onFilter != null) ? environment.getFilterFactory().generateFilter(onFilter, environment) : null;
|
final FilterableSource onFilterableSource = environment.getFilterFactory().generateFilter(onFilter, environment);
|
||||||
|
|
||||||
MultiEffectAppender result = new MultiEffectAppender();
|
MultiEffectAppender result = new MultiEffectAppender();
|
||||||
result.setPlayabilityCheckedForEffect(true);
|
result.setPlayabilityCheckedForEffect(true);
|
||||||
|
|||||||
Reference in New Issue
Block a user