mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2026-01-04 15:41:40 +00:00
f5b95a6716
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@b0da38c2 Repository details in RuntimeException for MavenLibraryResolver#addRepository (#12939) PaperMC/Paper@1922be90 Update custom tags (#12183) PaperMC/Paper@79cf1353 Ignore HopperInventorySearchEvent when it has no listeners (#13009) PaperMC/Paper@ea014f7a feat: add stuckEntityPoiRetryDelay config (#12949) PaperMC/Paper@a9e76749 Support for showNotification in PlayerRecipeDiscoverEvent (#12992) PaperMC/Paper@5622c9dd Expose attribute sentiment (#12974) PaperMC/Paper@42b653b1 Expose more argument types (#12665) PaperMC/Paper@52d9a221 [ci/skip] Fix typo in Display javadoc (#13010) PaperMC/Paper@614e9acf Improve APIs around riptide tridents (#12996) PaperMC/Paper@51706e5a Fixed DyeItem sheep dye hunk
19 lines
985 B
Diff
19 lines
985 B
Diff
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;
|