From 2f72924ec7b24b8574ba50470b4217af96bf9452 Mon Sep 17 00:00:00 2001
From: hayanesuru <hayanesuru@outlook.jp>
Date: Sun, 13 Jul 2025 19:40:10 +0900
Subject: [PATCH] fix MC-298464

---
 .../features/0275-fix-MC-298464.patch          | 18 ++++++++++++++++++
 .../leaf/config/modules/fixes/MC298464.java    | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 leaf-server/minecraft-patches/features/0275-fix-MC-298464.patch
 create mode 100644 leaf-server/src/main/java/org/dreeam/leaf/config/modules/fixes/MC298464.java

diff --git a/leaf-server/minecraft-patches/features/0275-fix-MC-298464.patch b/leaf-server/minecraft-patches/features/0275-fix-MC-298464.patch
new file mode 100644
index 00000000..c28c6c2f
--- /dev/null
+++ b/leaf-server/minecraft-patches/features/0275-fix-MC-298464.patch
@@ -0,0 +1,18 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: hayanesuru <hayanesuru@outlook.jp>
+Date: Sun, 13 Jul 2025 19:40:10 +0900
+Subject: [PATCH] fix MC-298464
+
+
+diff --git a/net/minecraft/world/damagesource/CombatTracker.java b/net/minecraft/world/damagesource/CombatTracker.java
+index aa6213ca382e4901363317df1e30332c5166f271..03b7397b303c883b14fbac7759ff296c4e55d778 100644
+--- a/net/minecraft/world/damagesource/CombatTracker.java
++++ b/net/minecraft/world/damagesource/CombatTracker.java
+@@ -47,6 +47,7 @@ public class CombatTracker {
+     public void recordDamageAndCheckCombatState(final CombatEntry combatEntry) {
+         final DamageSource source = combatEntry.source();
+     // Paper end - Combat tracker API
++        if (org.dreeam.leaf.config.modules.fixes.MC298464.enabled) { this.entries.clear(); } // Leaf - Fix MC-298464
+         this.entries.add(combatEntry);
+         this.lastDamageTime = this.mob.tickCount;
+         this.takingDamage = true;
diff --git a/leaf-server/src/main/java/org/dreeam/leaf/config/modules/fixes/MC298464.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/fixes/MC298464.java
new file mode 100644
index 00000000..624e555a
--- /dev/null
+++ b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/fixes/MC298464.java
@@ -0,0 +1,18 @@
+package org.dreeam.leaf.config.modules.fixes;
+
+import org.dreeam.leaf.config.ConfigModules;
+import org.dreeam.leaf.config.EnumConfigCategory;
+
+public class MC298464 extends ConfigModules {
+
+    public String getBasePath() {
+        return EnumConfigCategory.FIXES.getBaseKeyName();
+    }
+
+    public static boolean enabled = false;
+
+    @Override
+    public void onLoaded() {
+        enabled = config.getBoolean(getBasePath() + ".fix-mc298464", enabled);
+    }
+}