Fix patch conflict

2026-07-27 20:47:44 +08:00
parent 10cc76bbff
commit 484990074d
20 changed files with 45 additions and 41 deletions
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix player auto saving ignores interval


 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index b08af3a31b80125d02a4f2ff85311d2f9fdcc0ae..5f5c8f20169015627a265d0a974e89cb47a4a70c 100644
+index ada7dd26b52cd923bc78e6e6a513a2a1c592793d..1e40cc6f9bfd172a42a8f9624eb2fb554c6f11cf 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
@@ -208,7 +208,7 @@ import org.slf4j.Logger;