From 1caf18d0e1fe078155a111ca159272117c89cd9a Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Sat, 13 Jul 2024 19:19:50 +0800 Subject: [PATCH] Drop `Fix MC-2025` to fix abnormal entity bounding box --- patches/{ => removed}/server/0066-Fix-MC-2025.patch | 2 ++ .../server/{0067-Fix-MC-65198.patch => 0066-Fix-MC-65198.patch} | 0 .../{0068-Fix-MC-172047.patch => 0067-Fix-MC-172047.patch} | 0 ...ing-5s-in-getTPS.patch => 0068-Including-5s-in-getTPS.patch} | 0 ...-Remove-useless-creating-stats-json-bases-on-player-n.patch} | 0 ...graph.patch => 0070-Fix-NPE-during-creating-GUI-graph.patch} | 0 ...71-Don-t-throw-exception-on-missing-ResourceKey-value.patch} | 0 ...ur-AFK-system.patch => 0072-Improve-Purpur-AFK-system.patch} | 0 ...uler.patch => 0073-Virtual-Thread-for-async-scheduler.patch} | 0 ...patch => 0074-Use-a-shadow-fork-that-supports-Java-21.patch} | 0 ...Chat-Image-protocol.patch => 0075-Chat-Image-protocol.patch} | 0 ...Asteor-Bar-protocol.patch => 0076-Asteor-Bar-protocol.patch} | 0 ...ch => 0077-Mirai-Configurable-chat-message-signatures.patch} | 0 ...in-chat.patch => 0078-Block-log4j-rce-exploit-in-chat.patch} | 0 ...rofileResult.patch => 0079-Cache-player-profileResult.patch} | 0 ...-Prevent-change-non-editable-sign-warning-spam-in-con.patch} | 0 ...2-Matter-Secure-Seed.patch => 0081-Matter-Secure-Seed.patch} | 0 ...Matter-Seed-Command.patch => 0082-Matter-Seed-Command.patch} | 0 ...arning.patch => 0083-Ignore-terminal-provider-warning.patch} | 0 ...AVA-22.patch => 0084-Fix-console-freeze-above-JAVA-22.patch} | 0 ...andom-Generator.patch => 0085-Faster-Random-Generator.patch} | 0 ...tnt-entity.patch => 0086-Don-t-save-primed-tnt-entity.patch} | 0 ...-entity.patch => 0087-Don-t-save-falling-block-entity.patch} | 0 ... => 0088-Tracking-Optimize-Use-thread-safe-Collection.patch} | 0 ... => 0089-Tracking-Optimize-Reduce-expensive-iteration.patch} | 0 ...-Paper-Do-not-perform-chunk-existance-check-for-I-O-s.patch} | 0 ...0091-Remove-stream-in-BlockBehaviour-cache-blockstate.patch} | 0 ...allocations.patch => 0092-Reduce-worldgen-allocations.patch} | 0 .../{0094-Fix-MC-183518.patch => 0093-Fix-MC-183518.patch} | 0 ...va-compatibility.patch => 0094-Fix-Nova-compatibility.patch} | 0 30 files changed, 2 insertions(+) rename patches/{ => removed}/server/0066-Fix-MC-2025.patch (97%) rename patches/server/{0067-Fix-MC-65198.patch => 0066-Fix-MC-65198.patch} (100%) rename patches/server/{0068-Fix-MC-172047.patch => 0067-Fix-MC-172047.patch} (100%) rename patches/server/{0069-Including-5s-in-getTPS.patch => 0068-Including-5s-in-getTPS.patch} (100%) rename patches/server/{0070-Remove-useless-creating-stats-json-bases-on-player-n.patch => 0069-Remove-useless-creating-stats-json-bases-on-player-n.patch} (100%) rename patches/server/{0071-Fix-NPE-during-creating-GUI-graph.patch => 0070-Fix-NPE-during-creating-GUI-graph.patch} (100%) rename patches/server/{0072-Don-t-throw-exception-on-missing-ResourceKey-value.patch => 0071-Don-t-throw-exception-on-missing-ResourceKey-value.patch} (100%) rename patches/server/{0073-Improve-Purpur-AFK-system.patch => 0072-Improve-Purpur-AFK-system.patch} (100%) rename patches/server/{0074-Virtual-Thread-for-async-scheduler.patch => 0073-Virtual-Thread-for-async-scheduler.patch} (100%) rename patches/server/{0075-Use-a-shadow-fork-that-supports-Java-21.patch => 0074-Use-a-shadow-fork-that-supports-Java-21.patch} (100%) rename patches/server/{0076-Chat-Image-protocol.patch => 0075-Chat-Image-protocol.patch} (100%) rename patches/server/{0077-Asteor-Bar-protocol.patch => 0076-Asteor-Bar-protocol.patch} (100%) rename patches/server/{0078-Mirai-Configurable-chat-message-signatures.patch => 0077-Mirai-Configurable-chat-message-signatures.patch} (100%) rename patches/server/{0079-Block-log4j-rce-exploit-in-chat.patch => 0078-Block-log4j-rce-exploit-in-chat.patch} (100%) rename patches/server/{0080-Cache-player-profileResult.patch => 0079-Cache-player-profileResult.patch} (100%) rename patches/server/{0081-Prevent-change-non-editable-sign-warning-spam-in-con.patch => 0080-Prevent-change-non-editable-sign-warning-spam-in-con.patch} (100%) rename patches/server/{0082-Matter-Secure-Seed.patch => 0081-Matter-Secure-Seed.patch} (100%) rename patches/server/{0083-Matter-Seed-Command.patch => 0082-Matter-Seed-Command.patch} (100%) rename patches/server/{0084-Ignore-terminal-provider-warning.patch => 0083-Ignore-terminal-provider-warning.patch} (100%) rename patches/server/{0085-Fix-console-freeze-above-JAVA-22.patch => 0084-Fix-console-freeze-above-JAVA-22.patch} (100%) rename patches/server/{0086-Faster-Random-Generator.patch => 0085-Faster-Random-Generator.patch} (100%) rename patches/server/{0087-Don-t-save-primed-tnt-entity.patch => 0086-Don-t-save-primed-tnt-entity.patch} (100%) rename patches/server/{0088-Don-t-save-falling-block-entity.patch => 0087-Don-t-save-falling-block-entity.patch} (100%) rename patches/server/{0089-Tracking-Optimize-Use-thread-safe-Collection.patch => 0088-Tracking-Optimize-Use-thread-safe-Collection.patch} (100%) rename patches/server/{0090-Tracking-Optimize-Reduce-expensive-iteration.patch => 0089-Tracking-Optimize-Reduce-expensive-iteration.patch} (100%) rename patches/server/{0091-Paper-Do-not-perform-chunk-existance-check-for-I-O-s.patch => 0090-Paper-Do-not-perform-chunk-existance-check-for-I-O-s.patch} (100%) rename patches/server/{0092-Remove-stream-in-BlockBehaviour-cache-blockstate.patch => 0091-Remove-stream-in-BlockBehaviour-cache-blockstate.patch} (100%) rename patches/server/{0093-Reduce-worldgen-allocations.patch => 0092-Reduce-worldgen-allocations.patch} (100%) rename patches/server/{0094-Fix-MC-183518.patch => 0093-Fix-MC-183518.patch} (100%) rename patches/server/{0095-Fix-Nova-compatibility.patch => 0094-Fix-Nova-compatibility.patch} (100%) diff --git a/patches/server/0066-Fix-MC-2025.patch b/patches/removed/server/0066-Fix-MC-2025.patch similarity index 97% rename from patches/server/0066-Fix-MC-2025.patch rename to patches/removed/server/0066-Fix-MC-2025.patch index 453bdbe67..cb5d908cf 100644 --- a/patches/server/0066-Fix-MC-2025.patch +++ b/patches/removed/server/0066-Fix-MC-2025.patch @@ -3,6 +3,8 @@ From: HaHaWTH Date: Wed, 13 Mar 2024 03:04:36 +0800 Subject: [PATCH] Fix MC-2025 +Removed since 1.20.4, cause abnormal entity bounding box + Mojang issues: https://bugs.mojang.com/browse/MC-2025 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/patches/server/0067-Fix-MC-65198.patch b/patches/server/0066-Fix-MC-65198.patch similarity index 100% rename from patches/server/0067-Fix-MC-65198.patch rename to patches/server/0066-Fix-MC-65198.patch diff --git a/patches/server/0068-Fix-MC-172047.patch b/patches/server/0067-Fix-MC-172047.patch similarity index 100% rename from patches/server/0068-Fix-MC-172047.patch rename to patches/server/0067-Fix-MC-172047.patch diff --git a/patches/server/0069-Including-5s-in-getTPS.patch b/patches/server/0068-Including-5s-in-getTPS.patch similarity index 100% rename from patches/server/0069-Including-5s-in-getTPS.patch rename to patches/server/0068-Including-5s-in-getTPS.patch diff --git a/patches/server/0070-Remove-useless-creating-stats-json-bases-on-player-n.patch b/patches/server/0069-Remove-useless-creating-stats-json-bases-on-player-n.patch similarity index 100% rename from patches/server/0070-Remove-useless-creating-stats-json-bases-on-player-n.patch rename to patches/server/0069-Remove-useless-creating-stats-json-bases-on-player-n.patch diff --git a/patches/server/0071-Fix-NPE-during-creating-GUI-graph.patch b/patches/server/0070-Fix-NPE-during-creating-GUI-graph.patch similarity index 100% rename from patches/server/0071-Fix-NPE-during-creating-GUI-graph.patch rename to patches/server/0070-Fix-NPE-during-creating-GUI-graph.patch diff --git a/patches/server/0072-Don-t-throw-exception-on-missing-ResourceKey-value.patch b/patches/server/0071-Don-t-throw-exception-on-missing-ResourceKey-value.patch similarity index 100% rename from patches/server/0072-Don-t-throw-exception-on-missing-ResourceKey-value.patch rename to patches/server/0071-Don-t-throw-exception-on-missing-ResourceKey-value.patch diff --git a/patches/server/0073-Improve-Purpur-AFK-system.patch b/patches/server/0072-Improve-Purpur-AFK-system.patch similarity index 100% rename from patches/server/0073-Improve-Purpur-AFK-system.patch rename to patches/server/0072-Improve-Purpur-AFK-system.patch diff --git a/patches/server/0074-Virtual-Thread-for-async-scheduler.patch b/patches/server/0073-Virtual-Thread-for-async-scheduler.patch similarity index 100% rename from patches/server/0074-Virtual-Thread-for-async-scheduler.patch rename to patches/server/0073-Virtual-Thread-for-async-scheduler.patch diff --git a/patches/server/0075-Use-a-shadow-fork-that-supports-Java-21.patch b/patches/server/0074-Use-a-shadow-fork-that-supports-Java-21.patch similarity index 100% rename from patches/server/0075-Use-a-shadow-fork-that-supports-Java-21.patch rename to patches/server/0074-Use-a-shadow-fork-that-supports-Java-21.patch diff --git a/patches/server/0076-Chat-Image-protocol.patch b/patches/server/0075-Chat-Image-protocol.patch similarity index 100% rename from patches/server/0076-Chat-Image-protocol.patch rename to patches/server/0075-Chat-Image-protocol.patch diff --git a/patches/server/0077-Asteor-Bar-protocol.patch b/patches/server/0076-Asteor-Bar-protocol.patch similarity index 100% rename from patches/server/0077-Asteor-Bar-protocol.patch rename to patches/server/0076-Asteor-Bar-protocol.patch diff --git a/patches/server/0078-Mirai-Configurable-chat-message-signatures.patch b/patches/server/0077-Mirai-Configurable-chat-message-signatures.patch similarity index 100% rename from patches/server/0078-Mirai-Configurable-chat-message-signatures.patch rename to patches/server/0077-Mirai-Configurable-chat-message-signatures.patch diff --git a/patches/server/0079-Block-log4j-rce-exploit-in-chat.patch b/patches/server/0078-Block-log4j-rce-exploit-in-chat.patch similarity index 100% rename from patches/server/0079-Block-log4j-rce-exploit-in-chat.patch rename to patches/server/0078-Block-log4j-rce-exploit-in-chat.patch diff --git a/patches/server/0080-Cache-player-profileResult.patch b/patches/server/0079-Cache-player-profileResult.patch similarity index 100% rename from patches/server/0080-Cache-player-profileResult.patch rename to patches/server/0079-Cache-player-profileResult.patch diff --git a/patches/server/0081-Prevent-change-non-editable-sign-warning-spam-in-con.patch b/patches/server/0080-Prevent-change-non-editable-sign-warning-spam-in-con.patch similarity index 100% rename from patches/server/0081-Prevent-change-non-editable-sign-warning-spam-in-con.patch rename to patches/server/0080-Prevent-change-non-editable-sign-warning-spam-in-con.patch diff --git a/patches/server/0082-Matter-Secure-Seed.patch b/patches/server/0081-Matter-Secure-Seed.patch similarity index 100% rename from patches/server/0082-Matter-Secure-Seed.patch rename to patches/server/0081-Matter-Secure-Seed.patch diff --git a/patches/server/0083-Matter-Seed-Command.patch b/patches/server/0082-Matter-Seed-Command.patch similarity index 100% rename from patches/server/0083-Matter-Seed-Command.patch rename to patches/server/0082-Matter-Seed-Command.patch diff --git a/patches/server/0084-Ignore-terminal-provider-warning.patch b/patches/server/0083-Ignore-terminal-provider-warning.patch similarity index 100% rename from patches/server/0084-Ignore-terminal-provider-warning.patch rename to patches/server/0083-Ignore-terminal-provider-warning.patch diff --git a/patches/server/0085-Fix-console-freeze-above-JAVA-22.patch b/patches/server/0084-Fix-console-freeze-above-JAVA-22.patch similarity index 100% rename from patches/server/0085-Fix-console-freeze-above-JAVA-22.patch rename to patches/server/0084-Fix-console-freeze-above-JAVA-22.patch diff --git a/patches/server/0086-Faster-Random-Generator.patch b/patches/server/0085-Faster-Random-Generator.patch similarity index 100% rename from patches/server/0086-Faster-Random-Generator.patch rename to patches/server/0085-Faster-Random-Generator.patch diff --git a/patches/server/0087-Don-t-save-primed-tnt-entity.patch b/patches/server/0086-Don-t-save-primed-tnt-entity.patch similarity index 100% rename from patches/server/0087-Don-t-save-primed-tnt-entity.patch rename to patches/server/0086-Don-t-save-primed-tnt-entity.patch diff --git a/patches/server/0088-Don-t-save-falling-block-entity.patch b/patches/server/0087-Don-t-save-falling-block-entity.patch similarity index 100% rename from patches/server/0088-Don-t-save-falling-block-entity.patch rename to patches/server/0087-Don-t-save-falling-block-entity.patch diff --git a/patches/server/0089-Tracking-Optimize-Use-thread-safe-Collection.patch b/patches/server/0088-Tracking-Optimize-Use-thread-safe-Collection.patch similarity index 100% rename from patches/server/0089-Tracking-Optimize-Use-thread-safe-Collection.patch rename to patches/server/0088-Tracking-Optimize-Use-thread-safe-Collection.patch diff --git a/patches/server/0090-Tracking-Optimize-Reduce-expensive-iteration.patch b/patches/server/0089-Tracking-Optimize-Reduce-expensive-iteration.patch similarity index 100% rename from patches/server/0090-Tracking-Optimize-Reduce-expensive-iteration.patch rename to patches/server/0089-Tracking-Optimize-Reduce-expensive-iteration.patch diff --git a/patches/server/0091-Paper-Do-not-perform-chunk-existance-check-for-I-O-s.patch b/patches/server/0090-Paper-Do-not-perform-chunk-existance-check-for-I-O-s.patch similarity index 100% rename from patches/server/0091-Paper-Do-not-perform-chunk-existance-check-for-I-O-s.patch rename to patches/server/0090-Paper-Do-not-perform-chunk-existance-check-for-I-O-s.patch diff --git a/patches/server/0092-Remove-stream-in-BlockBehaviour-cache-blockstate.patch b/patches/server/0091-Remove-stream-in-BlockBehaviour-cache-blockstate.patch similarity index 100% rename from patches/server/0092-Remove-stream-in-BlockBehaviour-cache-blockstate.patch rename to patches/server/0091-Remove-stream-in-BlockBehaviour-cache-blockstate.patch diff --git a/patches/server/0093-Reduce-worldgen-allocations.patch b/patches/server/0092-Reduce-worldgen-allocations.patch similarity index 100% rename from patches/server/0093-Reduce-worldgen-allocations.patch rename to patches/server/0092-Reduce-worldgen-allocations.patch diff --git a/patches/server/0094-Fix-MC-183518.patch b/patches/server/0093-Fix-MC-183518.patch similarity index 100% rename from patches/server/0094-Fix-MC-183518.patch rename to patches/server/0093-Fix-MC-183518.patch diff --git a/patches/server/0095-Fix-Nova-compatibility.patch b/patches/server/0094-Fix-Nova-compatibility.patch similarity index 100% rename from patches/server/0095-Fix-Nova-compatibility.patch rename to patches/server/0094-Fix-Nova-compatibility.patch