diff --git a/patches/server/0056-Fix-MC-2025.patch b/patches/removed/server/0056-Fix-MC-2025.patch similarity index 97% rename from patches/server/0056-Fix-MC-2025.patch rename to patches/removed/server/0056-Fix-MC-2025.patch index a1581cbc..dac6813f 100644 --- a/patches/server/0056-Fix-MC-2025.patch +++ b/patches/removed/server/0056-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/0057-Fix-MC-65198.patch b/patches/server/0056-Fix-MC-65198.patch similarity index 100% rename from patches/server/0057-Fix-MC-65198.patch rename to patches/server/0056-Fix-MC-65198.patch diff --git a/patches/server/0058-Including-5s-in-getTPS.patch b/patches/server/0057-Including-5s-in-getTPS.patch similarity index 100% rename from patches/server/0058-Including-5s-in-getTPS.patch rename to patches/server/0057-Including-5s-in-getTPS.patch diff --git a/patches/server/0059-Remove-useless-creating-stats-json-bases-on-player-n.patch b/patches/server/0058-Remove-useless-creating-stats-json-bases-on-player-n.patch similarity index 100% rename from patches/server/0059-Remove-useless-creating-stats-json-bases-on-player-n.patch rename to patches/server/0058-Remove-useless-creating-stats-json-bases-on-player-n.patch diff --git a/patches/server/0060-Fix-NPE-during-creating-GUI-graph.patch b/patches/server/0059-Fix-NPE-during-creating-GUI-graph.patch similarity index 100% rename from patches/server/0060-Fix-NPE-during-creating-GUI-graph.patch rename to patches/server/0059-Fix-NPE-during-creating-GUI-graph.patch diff --git a/patches/server/0061-Don-t-throw-exception-on-missing-ResourceKey-value.patch b/patches/server/0060-Don-t-throw-exception-on-missing-ResourceKey-value.patch similarity index 100% rename from patches/server/0061-Don-t-throw-exception-on-missing-ResourceKey-value.patch rename to patches/server/0060-Don-t-throw-exception-on-missing-ResourceKey-value.patch diff --git a/patches/server/0062-Improve-Purpur-AFK-system.patch b/patches/server/0061-Improve-Purpur-AFK-system.patch similarity index 100% rename from patches/server/0062-Improve-Purpur-AFK-system.patch rename to patches/server/0061-Improve-Purpur-AFK-system.patch diff --git a/patches/server/0063-Virtual-Thread-for-async-scheduler.patch b/patches/server/0062-Virtual-Thread-for-async-scheduler.patch similarity index 100% rename from patches/server/0063-Virtual-Thread-for-async-scheduler.patch rename to patches/server/0062-Virtual-Thread-for-async-scheduler.patch diff --git a/patches/server/0064-Mirai-Configurable-chat-message-signatures.patch b/patches/server/0063-Mirai-Configurable-chat-message-signatures.patch similarity index 100% rename from patches/server/0064-Mirai-Configurable-chat-message-signatures.patch rename to patches/server/0063-Mirai-Configurable-chat-message-signatures.patch diff --git a/patches/server/0065-Block-log4j-rce-exploit-in-chat.patch b/patches/server/0064-Block-log4j-rce-exploit-in-chat.patch similarity index 96% rename from patches/server/0065-Block-log4j-rce-exploit-in-chat.patch rename to patches/server/0064-Block-log4j-rce-exploit-in-chat.patch index 54cee257..2d00c989 100644 --- a/patches/server/0065-Block-log4j-rce-exploit-in-chat.patch +++ b/patches/server/0064-Block-log4j-rce-exploit-in-chat.patch @@ -34,7 +34,7 @@ index 7d691af2d3e1baa046dd3ab2ba70f8cf7bbd3c21..4ea341d586fae146659338f4cf70ee05 for (int i = 0; i < message.length(); ++i) { if (!StringUtil.isAllowedChatCharacter(message.charAt(i))) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6a6a82124144f16146cd7b1fba1725b873d1250a..aac0f0c5dea5f7b8ef50d4f12fe9b5b9e25c8741 100644 +index 0fa903d2a343d576ce12b22bb3c46c48930ba519..60e5f1c9af60a6f75bf6444dc7d36517905c18e2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -753,6 +753,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0066-Cache-player-profileResult.patch b/patches/server/0065-Cache-player-profileResult.patch similarity index 100% rename from patches/server/0066-Cache-player-profileResult.patch rename to patches/server/0065-Cache-player-profileResult.patch diff --git a/patches/server/0067-Prevent-change-non-editable-sign-warning-spam-in-con.patch b/patches/server/0066-Prevent-change-non-editable-sign-warning-spam-in-con.patch similarity index 100% rename from patches/server/0067-Prevent-change-non-editable-sign-warning-spam-in-con.patch rename to patches/server/0066-Prevent-change-non-editable-sign-warning-spam-in-con.patch diff --git a/patches/server/0068-Ignore-terminal-provider-warning.patch b/patches/server/0067-Ignore-terminal-provider-warning.patch similarity index 91% rename from patches/server/0068-Ignore-terminal-provider-warning.patch rename to patches/server/0067-Ignore-terminal-provider-warning.patch index 2d1c96da..2bacc89a 100644 --- a/patches/server/0068-Ignore-terminal-provider-warning.patch +++ b/patches/server/0067-Ignore-terminal-provider-warning.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ignore terminal provider warning diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index f86093a51495a736e8c82afc9fee08e91e1fb697..5c42d739b86e88ca97637696dcf658371cecf535 100644 +index d26f85511bb091a54d2059ef8f59f5df3093ccde..29a26b45f2dea70a3b72f08d88882c62b47e3382 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -324,6 +324,9 @@ public class Main { diff --git a/patches/server/0069-Fix-console-freeze-above-JAVA-22.patch b/patches/server/0068-Fix-console-freeze-above-JAVA-22.patch similarity index 92% rename from patches/server/0069-Fix-console-freeze-above-JAVA-22.patch rename to patches/server/0068-Fix-console-freeze-above-JAVA-22.patch index 44d7bec1..13cea568 100644 --- a/patches/server/0069-Fix-console-freeze-above-JAVA-22.patch +++ b/patches/server/0068-Fix-console-freeze-above-JAVA-22.patch @@ -7,7 +7,7 @@ Revert to old console provider, Fix https://github.com/PaperMC/Paper/issues/1040 Solution refers to https://inside.java/2023/07/31/quality-heads-up diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 5c42d739b86e88ca97637696dcf658371cecf535..97c7afc78350e25c5853d5c2fe703131af78d531 100644 +index 29a26b45f2dea70a3b72f08d88882c62b47e3382..c3c5cfbfd2d1f25d98d8dc0cca31fdc47d2af0bb 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -326,6 +326,7 @@ public class Main { diff --git a/patches/server/0070-Fix-console-output-display-on-Pterodactyl-panel.patch b/patches/server/0069-Fix-console-output-display-on-Pterodactyl-panel.patch similarity index 94% rename from patches/server/0070-Fix-console-output-display-on-Pterodactyl-panel.patch rename to patches/server/0069-Fix-console-output-display-on-Pterodactyl-panel.patch index ba8cf859..86a096be 100644 --- a/patches/server/0070-Fix-console-output-display-on-Pterodactyl-panel.patch +++ b/patches/server/0069-Fix-console-output-display-on-Pterodactyl-panel.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix console output display on Pterodactyl panel Fixed console display issue when the terminal used xterm, should work on Pterodactyl, MCSManager and kind of panel software diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 97c7afc78350e25c5853d5c2fe703131af78d531..0e3d538579acfab6f190c9b76f4b522989092f00 100644 +index c3c5cfbfd2d1f25d98d8dc0cca31fdc47d2af0bb..a0d67bab9f5efe137009b5d82e09a01f24a8e0a0 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -328,6 +328,14 @@ public class Main { diff --git a/patches/server/0071-Faster-Random-Generator.patch b/patches/server/0070-Faster-Random-Generator.patch similarity index 100% rename from patches/server/0071-Faster-Random-Generator.patch rename to patches/server/0070-Faster-Random-Generator.patch diff --git a/patches/server/0072-Don-t-save-primed-tnt-entity.patch b/patches/server/0071-Don-t-save-primed-tnt-entity.patch similarity index 100% rename from patches/server/0072-Don-t-save-primed-tnt-entity.patch rename to patches/server/0071-Don-t-save-primed-tnt-entity.patch diff --git a/patches/server/0073-Don-t-save-falling-block-entity.patch b/patches/server/0072-Don-t-save-falling-block-entity.patch similarity index 100% rename from patches/server/0073-Don-t-save-falling-block-entity.patch rename to patches/server/0072-Don-t-save-falling-block-entity.patch diff --git a/patches/server/0074-Configurable-connection-message.patch b/patches/server/0073-Configurable-connection-message.patch similarity index 100% rename from patches/server/0074-Configurable-connection-message.patch rename to patches/server/0073-Configurable-connection-message.patch diff --git a/patches/server/0075-Remove-stream-in-BlockBehaviour-cache-blockstate.patch b/patches/server/0074-Remove-stream-in-BlockBehaviour-cache-blockstate.patch similarity index 100% rename from patches/server/0075-Remove-stream-in-BlockBehaviour-cache-blockstate.patch rename to patches/server/0074-Remove-stream-in-BlockBehaviour-cache-blockstate.patch diff --git a/patches/server/0076-Reduce-worldgen-allocations.patch b/patches/server/0075-Reduce-worldgen-allocations.patch similarity index 100% rename from patches/server/0076-Reduce-worldgen-allocations.patch rename to patches/server/0075-Reduce-worldgen-allocations.patch diff --git a/patches/server/0077-Fix-MC-183518.patch b/patches/server/0076-Fix-MC-183518.patch similarity index 100% rename from patches/server/0077-Fix-MC-183518.patch rename to patches/server/0076-Fix-MC-183518.patch diff --git a/patches/server/0078-Use-caffeine-cache-kickPermission-instead-of-using-g.patch b/patches/server/0077-Use-caffeine-cache-kickPermission-instead-of-using-g.patch similarity index 100% rename from patches/server/0078-Use-caffeine-cache-kickPermission-instead-of-using-g.patch rename to patches/server/0077-Use-caffeine-cache-kickPermission-instead-of-using-g.patch diff --git a/patches/server/0079-Do-not-place-player-if-the-server-is-full.patch b/patches/server/0078-Do-not-place-player-if-the-server-is-full.patch similarity index 100% rename from patches/server/0079-Do-not-place-player-if-the-server-is-full.patch rename to patches/server/0078-Do-not-place-player-if-the-server-is-full.patch diff --git a/patches/server/0080-Fix-MC-200418.patch b/patches/server/0079-Fix-MC-200418.patch similarity index 100% rename from patches/server/0080-Fix-MC-200418.patch rename to patches/server/0079-Fix-MC-200418.patch diff --git a/patches/server/0081-Fix-MC-119417.patch b/patches/server/0080-Fix-MC-119417.patch similarity index 100% rename from patches/server/0081-Fix-MC-119417.patch rename to patches/server/0080-Fix-MC-119417.patch diff --git a/patches/server/0082-Fix-MC-223153.patch b/patches/server/0081-Fix-MC-223153.patch similarity index 100% rename from patches/server/0082-Fix-MC-223153.patch rename to patches/server/0081-Fix-MC-223153.patch