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

Update ResolutionMergePackMcMeta.java

Browse Source
This commit is contained in:
XiaoMoMi
2025-12-11 22:48:17 +08:00
parent c42e1f87d7
commit 5f4b13ea4f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/net/momirealms/craftengine/core/pack/conflict/resolution/ResolutionMergePackMcMeta.java
View File

@@ -345,8 +345,8 @@ public class ResolutionMergePackMcMeta implements Resolution {
public void run(PathContext existing, PathContext conflict) { public void run(PathContext existing, PathContext conflict) {
try { try {
mergeMcMeta(existing.path(), conflict.path(), AdventureHelper.componentToJsonElement(AdventureHelper.miniMessage().deserialize(this.description))); mergeMcMeta(existing.path(), conflict.path(), AdventureHelper.componentToJsonElement(AdventureHelper.miniMessage().deserialize(this.description)));
} catch (IOException e) { } catch (Exception e) {
CraftEngine.instance().logger().severe("Failed to merge pack.mcmeta when resolving file conflicts", e); CraftEngine.instance().logger().severe("Failed to merge pack.mcmeta when resolving file conflicts for '" + existing.path() + "' and '" + conflict.path() + "'", e);
} }
} }