ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing memory retrieval not working with MinTwilight and MaxTwilight filters

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2021-11-24 21:07:58 -06:00
parent 9235f9171f
commit ee7750fdc4
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/filter/FilterFactory.java
View File

@@ -294,8 +294,13 @@ public class FilterFactory {
if (parameter.startsWith("memory(") && parameter.endsWith(")")) {
String memory = parameter.substring(parameter.indexOf("(") + 1, parameter.lastIndexOf(")"));
return actionContext -> {
final int value = Integer.parseInt(actionContext.getValueFromMemory(memory));
return Filters.maxPrintedTwilightCost(value);
try{
final int value = Integer.parseInt(actionContext.getValueFromMemory(memory));
return Filters.maxPrintedTwilightCost(value);
}
catch(IllegalArgumentException ex) {
return Filters.maxPrintedTwilightCost(100);
}
};
} else {
final ValueSource valueSource = ValueResolver.resolveEvaluator(parameter, environment);
@@ -310,8 +315,13 @@ public class FilterFactory {
if (parameter.startsWith("memory(") && parameter.endsWith(")")) {
String memory = parameter.substring(parameter.indexOf("(") + 1, parameter.lastIndexOf(")"));
return actionContext -> {
final int value = Integer.parseInt(actionContext.getValueFromMemory(memory));
return Filters.minPrintedTwilightCost(value);
try {
final int value = Integer.parseInt(actionContext.getValueFromMemory(memory));
return Filters.minPrintedTwilightCost(value);
}
catch(IllegalArgumentException ex) {
return Filters.maxPrintedTwilightCost(0);
}
};
} else {
final ValueSource valueSource = ValueResolver.resolveEvaluator(parameter, environment);