From 5f4b13ea4fbf9e6cf02568bc3f74bb3e7bb09373 Mon Sep 17 00:00:00 2001
From: XiaoMoMi <littlemomi@qq.com>
Date: Thu, 11 Dec 2025 22:48:17 +0800
Subject: [PATCH] Update ResolutionMergePackMcMeta.java

---
 .../pack/conflict/resolution/ResolutionMergePackMcMeta.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/conflict/resolution/ResolutionMergePackMcMeta.java b/core/src/main/java/net/momirealms/craftengine/core/pack/conflict/resolution/ResolutionMergePackMcMeta.java
index dcba60b63..8adaaa1eb 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/pack/conflict/resolution/ResolutionMergePackMcMeta.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/pack/conflict/resolution/ResolutionMergePackMcMeta.java
@@ -345,8 +345,8 @@ public class ResolutionMergePackMcMeta implements Resolution {
     public void run(PathContext existing, PathContext conflict) {
         try {
             mergeMcMeta(existing.path(), conflict.path(), AdventureHelper.componentToJsonElement(AdventureHelper.miniMessage().deserialize(this.description)));
-        } catch (IOException e) {
-            CraftEngine.instance().logger().severe("Failed to merge pack.mcmeta when resolving file conflicts", e);
+        } catch (Exception e) {
+            CraftEngine.instance().logger().severe("Failed to merge pack.mcmeta when resolving file conflicts for '" + existing.path()  + "' and '" + conflict.path() + "'", e);
         }
     }