Drop Fix MC-2025 to fix abnormal entity bounding box

Winds-Studio · Jul 13, 2024 · 0e65d24 · 0e65d24
1 parent cf8716a
commit 0e65d24
Show file tree

Hide file tree

Showing 27 changed files with 6 additions and 4 deletions.
diff --git a/patches/server/0056-Fix-MC-2025.patch → ...hes/removed/server/0056-Fix-MC-2025.patch b/patches/server/0056-Fix-MC-2025.patch → ...hes/removed/server/0056-Fix-MC-2025.patch
@@ -3,6 +3,8 @@ From: HaHaWTH <fsjk947@gmail.com>
 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 → patches/server/0056-Fix-MC-65198.patch b/patches/server/0057-Fix-MC-65198.patch → patches/server/0056-Fix-MC-65198.patch
diff --git a/.../server/0058-Including-5s-in-getTPS.patch → .../server/0057-Including-5s-in-getTPS.patch b/.../server/0058-Including-5s-in-getTPS.patch → .../server/0057-Including-5s-in-getTPS.patch
diff --git a/...eating-stats-json-bases-on-player-n.patch → ...eating-stats-json-bases-on-player-n.patch b/...eating-stats-json-bases-on-player-n.patch → ...eating-stats-json-bases-on-player-n.patch
diff --git a/...0-Fix-NPE-during-creating-GUI-graph.patch → ...9-Fix-NPE-during-creating-GUI-graph.patch b/...0-Fix-NPE-during-creating-GUI-graph.patch → ...9-Fix-NPE-during-creating-GUI-graph.patch
diff --git a/...eption-on-missing-ResourceKey-value.patch → ...eption-on-missing-ResourceKey-value.patch b/...eption-on-missing-ResourceKey-value.patch → ...eption-on-missing-ResourceKey-value.patch
diff --git a/...rver/0062-Improve-Purpur-AFK-system.patch → ...rver/0061-Improve-Purpur-AFK-system.patch b/...rver/0062-Improve-Purpur-AFK-system.patch → ...rver/0061-Improve-Purpur-AFK-system.patch
diff --git a/...-Virtual-Thread-for-async-scheduler.patch → ...-Virtual-Thread-for-async-scheduler.patch b/...-Virtual-Thread-for-async-scheduler.patch → ...-Virtual-Thread-for-async-scheduler.patch
diff --git a/...onfigurable-chat-message-signatures.patch → ...onfigurable-chat-message-signatures.patch b/...onfigurable-chat-message-signatures.patch → ...onfigurable-chat-message-signatures.patch
diff --git a/...065-Block-log4j-rce-exploit-in-chat.patch → ...064-Block-log4j-rce-exploit-in-chat.patch b/...065-Block-log4j-rce-exploit-in-chat.patch → ...064-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/...ver/0066-Cache-player-profileResult.patch → ...ver/0065-Cache-player-profileResult.patch b/...ver/0066-Cache-player-profileResult.patch → ...ver/0065-Cache-player-profileResult.patch
diff --git a/...n-editable-sign-warning-spam-in-con.patch → ...n-editable-sign-warning-spam-in-con.patch b/...n-editable-sign-warning-spam-in-con.patch → ...n-editable-sign-warning-spam-in-con.patch
diff --git a/...68-Ignore-terminal-provider-warning.patch → ...67-Ignore-terminal-provider-warning.patch b/...68-Ignore-terminal-provider-warning.patch → ...67-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/...69-Fix-console-freeze-above-JAVA-22.patch → ...68-Fix-console-freeze-above-JAVA-22.patch b/...69-Fix-console-freeze-above-JAVA-22.patch → ...68-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/...output-display-on-Pterodactyl-panel.patch → ...output-display-on-Pterodactyl-panel.patch b/...output-display-on-Pterodactyl-panel.patch → ...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/...server/0071-Faster-Random-Generator.patch → ...server/0070-Faster-Random-Generator.patch b/...server/0071-Faster-Random-Generator.patch → ...server/0070-Faster-Random-Generator.patch
diff --git a/...r/0072-Don-t-save-primed-tnt-entity.patch → ...r/0071-Don-t-save-primed-tnt-entity.patch b/...r/0072-Don-t-save-primed-tnt-entity.patch → ...r/0071-Don-t-save-primed-tnt-entity.patch
diff --git a/...073-Don-t-save-falling-block-entity.patch → ...072-Don-t-save-falling-block-entity.patch b/...073-Don-t-save-falling-block-entity.patch → ...072-Don-t-save-falling-block-entity.patch
diff --git a/...074-Configurable-connection-message.patch → ...073-Configurable-connection-message.patch b/...074-Configurable-connection-message.patch → ...073-Configurable-connection-message.patch
diff --git a/...-in-BlockBehaviour-cache-blockstate.patch → ...-in-BlockBehaviour-cache-blockstate.patch b/...-in-BlockBehaviour-cache-blockstate.patch → ...-in-BlockBehaviour-cache-blockstate.patch
diff --git a/...er/0076-Reduce-worldgen-allocations.patch → ...er/0075-Reduce-worldgen-allocations.patch b/...er/0076-Reduce-worldgen-allocations.patch → ...er/0075-Reduce-worldgen-allocations.patch
diff --git a/patches/server/0077-Fix-MC-183518.patch → patches/server/0076-Fix-MC-183518.patch b/patches/server/0077-Fix-MC-183518.patch → patches/server/0076-Fix-MC-183518.patch
diff --git a/...e-kickPermission-instead-of-using-g.patch → ...e-kickPermission-instead-of-using-g.patch b/...e-kickPermission-instead-of-using-g.patch → ...e-kickPermission-instead-of-using-g.patch
diff --git a/...-place-player-if-the-server-is-full.patch → ...-place-player-if-the-server-is-full.patch b/...-place-player-if-the-server-is-full.patch → ...-place-player-if-the-server-is-full.patch
diff --git a/patches/server/0080-Fix-MC-200418.patch → patches/server/0079-Fix-MC-200418.patch b/patches/server/0080-Fix-MC-200418.patch → patches/server/0079-Fix-MC-200418.patch
diff --git a/patches/server/0081-Fix-MC-119417.patch → patches/server/0080-Fix-MC-119417.patch b/patches/server/0081-Fix-MC-119417.patch → patches/server/0080-Fix-MC-119417.patch
diff --git a/patches/server/0082-Fix-MC-223153.patch → patches/server/0081-Fix-MC-223153.patch b/patches/server/0082-Fix-MC-223153.patch → patches/server/0081-Fix-MC-223153.patch