external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'keys' into 'master'

Browse Source 
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
parent efb8ff00c4 1529ffe630
commit f8c35d7d9b
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-ai/src/main/java/forge/ai/ComputerUtilCost.java
View File

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

2
forge-core/src/main/java/forge/ImageKeys.java
View File

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