Merge branch 'keys' into 'master'

Fix ImageKeys again

See merge request core-developers/forge!5266
This commit is contained in:
Bug Hunter
2021-08-28 05:39:13 +00:00
2 changed files with 4 additions and 1 deletions

View File

@@ -236,6 +236,9 @@ public class ComputerUtilCost {
if (cost == null) {
return true;
}
if (!ai.isAI()) {
return false;
}
for (final CostPart part : cost.getCostParts()) {
if (part instanceof CostSacrifice) {
CardCollection list = new CardCollection();

View File

@@ -236,7 +236,7 @@ public final class ImageKeys {
cachedContent.put(setFolder, setFolderContent);
}
}
String[] keyParts = StringUtils.split(pc.getImageKeyFromSet(), "//");
String[] keyParts = StringUtils.split(pc.getCardImageKey(), "//");
if (keyParts.length != 2)
return false;
HashSet<String> content = cachedContent.getOrDefault(keyParts[0], null);