diff --git a/FightSystem/FightSystem_21/build.gradle.kts b/FightSystem/FightSystem_21/build.gradle.kts
index a8c67f6f..6de2b25a 100644
--- a/FightSystem/FightSystem_21/build.gradle.kts
+++ b/FightSystem/FightSystem_21/build.gradle.kts
@@ -42,4 +42,5 @@ dependencies {
 
     compileOnly(libs.fastutil)
     compileOnly(libs.authlib)
+    compileOnly(project(":FightSystem:FightSystem_14"))
 }
diff --git a/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/FlatteningWrapper21.java b/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/FlatteningWrapper21.java
new file mode 100644
index 00000000..70dad919
--- /dev/null
+++ b/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/FlatteningWrapper21.java
@@ -0,0 +1,33 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.fightsystem.utils;
+
+import org.bukkit.inventory.ItemStack;
+
+public class FlatteningWrapper21 extends FlatteningWrapper14 {
+    @Override
+    public boolean hasAttributeModifier(ItemStack stack) {
+        if (!stack.getDataTypes().isEmpty()) {
+            return true;
+        }
+
+        return super.hasAttributeModifier(stack);
+    }
+}