From fb4b8757d6604ed46f477bfbe8295080d1a24c76 Mon Sep 17 00:00:00 2001
From: Armamem0t <minglipro@163.com>
Date: Tue, 15 Jul 2025 16:54:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20src/main/java/com/mingliqi?=
 =?UTF-8?q?ye/minecraft/enchantment/conflict/enchantment/Enchantment.java?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../minecraft/enchantment/conflict/enchantment/Enchantment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/mingliqiye/minecraft/enchantment/conflict/enchantment/Enchantment.java b/src/main/java/com/mingliqiye/minecraft/enchantment/conflict/enchantment/Enchantment.java
index 342d242..1c497af 100644
--- a/src/main/java/com/mingliqiye/minecraft/enchantment/conflict/enchantment/Enchantment.java
+++ b/src/main/java/com/mingliqiye/minecraft/enchantment/conflict/enchantment/Enchantment.java
@@ -61,7 +61,7 @@ public class Enchantment {
         List<Enchantment> groupsB = ofId(enchantmentB, config);
 
         if (groupsA.isEmpty() && groupsB.isEmpty()) {
-            return true;
+            return null;
         }
 
         for (Enchantment groupA : groupsA) {