Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2026-01-04 15:41:38 +00:00
Code Issues Releases Activity

修复merges合并

Browse Source
This commit is contained in:
XiaoMoMi
2025-10-22 16:51:06 +08:00
parent 8ccbf32cec
commit 93b92f8d4b
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/net/momirealms/craftengine/core/plugin/config/template/TemplateManagerImpl.java
View File

@@ -272,14 +272,8 @@ public class TemplateManagerImpl implements TemplateManager {
}
}
if (hasMerges && merge instanceof Map<?, ?> rawMerges) {
Map<ArgumentString, Object> mergeMap = (Map<ArgumentString, Object>) rawMerges;
for (Map.Entry<ArgumentString, Object> inputEntry : mergeMap.entrySet()) {
ArgumentString inputKey = inputEntry.getKey();
Object key = inputKey.get(parentArguments);
if (key != null) {
merges.put(key.toString(), processUnknownValue(inputEntry.getValue(), arguments));
}
}
Map<String, Object> mergeMap = (Map<String, Object>) rawMerges;
merges.putAll(mergeMap);
}
return new TemplateProcessingResult(
templateList,