From ddf3df8d69d943b97d76efb12ca6cddc7d27111f Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Sun, 11 Aug 2024 23:07:59 +0800 Subject: [PATCH] Drop Block log4j rce exploit in chat --- .../server/0068-Block-log4j-rce-exploit-in-chat.patch | 1 + ...leResult.patch => 0068-Cache-player-profileResult.patch} | 0 ...vent-change-non-editable-sign-warning-spam-in-con.patch} | 0 ...tter-Secure-Seed.patch => 0070-Matter-Secure-Seed.patch} | 2 +- ...er-Seed-Command.patch => 0071-Matter-Seed-Command.patch} | 0 ...ng.patch => 0072-Ignore-terminal-provider-warning.patch} | 0 ...22.patch => 0073-Fix-console-freeze-above-JAVA-22.patch} | 0 ...4-Fix-console-output-display-on-Pterodactyl-panel.patch} | 0 ...m-Generator.patch => 0075-Faster-Random-Generator.patch} | 0 ...entity.patch => 0076-Don-t-save-primed-tnt-entity.patch} | 0 ...ity.patch => 0077-Don-t-save-falling-block-entity.patch} | 0 ...age.patch => 0078-Configurable-connection-message.patch} | 0 ...atch => 0079-Configurable-unknown-command-message.patch} | 0 ...-Remove-stream-in-BlockBehaviour-cache-blockstate.patch} | 0 ...cations.patch => 0081-Reduce-worldgen-allocations.patch} | 0 .../{0083-Fix-MC-183518.patch => 0082-Fix-MC-183518.patch} | 0 ...-caffeine-cache-kickPermission-instead-of-using-g.patch} | 2 +- ...=> 0084-Do-not-place-player-if-the-server-is-full.patch} | 0 .../{0086-Fix-MC-200418.patch => 0085-Fix-MC-200418.patch} | 0 .../{0087-Fix-MC-119417.patch => 0086-Fix-MC-119417.patch} | 0 .../{0088-Fix-MC-223153.patch => 0087-Fix-MC-223153.patch} | 0 ...0088-Optimize-LeavesProtocolManager-init-protocol.patch} | 0 ...Optimize-check-nearby-fire-or-lava-on-entity-move.patch} | 0 ...0090-Airplane-Remove-streams-in-PoiCompetitorScan.patch} | 0 ...1-Cache-CraftEntityType-minecraftToBukkit-convert.patch} | 0 ...atch => 0092-Configurable-player-knockback-zombie.patch} | 2 +- ...=> 0093-Hide-specified-item-components-to-clients.patch} | 6 +++--- ...er-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch} | 0 ...er-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch} | 0 ...h => 0096-Paper-PR-Throttle-failed-spawn-attempts.patch} | 0 ...er-PR-Prevent-zombie-reinforcements-loading-chunk.patch} | 0 ...ts.patch => 0098-Dont-send-useless-entity-packets.patch} | 0 32 files changed, 7 insertions(+), 6 deletions(-) rename patches/{ => removed}/server/0068-Block-log4j-rce-exploit-in-chat.patch (99%) rename patches/server/{0069-Cache-player-profileResult.patch => 0068-Cache-player-profileResult.patch} (100%) rename patches/server/{0070-Prevent-change-non-editable-sign-warning-spam-in-con.patch => 0069-Prevent-change-non-editable-sign-warning-spam-in-con.patch} (100%) rename patches/server/{0071-Matter-Secure-Seed.patch => 0070-Matter-Secure-Seed.patch} (99%) rename patches/server/{0072-Matter-Seed-Command.patch => 0071-Matter-Seed-Command.patch} (100%) rename patches/server/{0073-Ignore-terminal-provider-warning.patch => 0072-Ignore-terminal-provider-warning.patch} (100%) rename patches/server/{0074-Fix-console-freeze-above-JAVA-22.patch => 0073-Fix-console-freeze-above-JAVA-22.patch} (100%) rename patches/server/{0075-Fix-console-output-display-on-Pterodactyl-panel.patch => 0074-Fix-console-output-display-on-Pterodactyl-panel.patch} (100%) rename patches/server/{0076-Faster-Random-Generator.patch => 0075-Faster-Random-Generator.patch} (100%) rename patches/server/{0077-Don-t-save-primed-tnt-entity.patch => 0076-Don-t-save-primed-tnt-entity.patch} (100%) rename patches/server/{0078-Don-t-save-falling-block-entity.patch => 0077-Don-t-save-falling-block-entity.patch} (100%) rename patches/server/{0079-Configurable-connection-message.patch => 0078-Configurable-connection-message.patch} (100%) rename patches/server/{0080-Configurable-unknown-command-message.patch => 0079-Configurable-unknown-command-message.patch} (100%) rename patches/server/{0081-Remove-stream-in-BlockBehaviour-cache-blockstate.patch => 0080-Remove-stream-in-BlockBehaviour-cache-blockstate.patch} (100%) rename patches/server/{0082-Reduce-worldgen-allocations.patch => 0081-Reduce-worldgen-allocations.patch} (100%) rename patches/server/{0083-Fix-MC-183518.patch => 0082-Fix-MC-183518.patch} (100%) rename patches/server/{0084-Use-caffeine-cache-kickPermission-instead-of-using-g.patch => 0083-Use-caffeine-cache-kickPermission-instead-of-using-g.patch} (96%) rename patches/server/{0085-Do-not-place-player-if-the-server-is-full.patch => 0084-Do-not-place-player-if-the-server-is-full.patch} (100%) rename patches/server/{0086-Fix-MC-200418.patch => 0085-Fix-MC-200418.patch} (100%) rename patches/server/{0087-Fix-MC-119417.patch => 0086-Fix-MC-119417.patch} (100%) rename patches/server/{0088-Fix-MC-223153.patch => 0087-Fix-MC-223153.patch} (100%) rename patches/server/{0089-Optimize-LeavesProtocolManager-init-protocol.patch => 0088-Optimize-LeavesProtocolManager-init-protocol.patch} (100%) rename patches/server/{0090-Optimize-check-nearby-fire-or-lava-on-entity-move.patch => 0089-Optimize-check-nearby-fire-or-lava-on-entity-move.patch} (100%) rename patches/server/{0091-Airplane-Remove-streams-in-PoiCompetitorScan.patch => 0090-Airplane-Remove-streams-in-PoiCompetitorScan.patch} (100%) rename patches/server/{0092-Cache-CraftEntityType-minecraftToBukkit-convert.patch => 0091-Cache-CraftEntityType-minecraftToBukkit-convert.patch} (100%) rename patches/server/{0093-Configurable-player-knockback-zombie.patch => 0092-Configurable-player-knockback-zombie.patch} (97%) rename patches/server/{0094-Hide-specified-item-components-to-clients.patch => 0093-Hide-specified-item-components-to-clients.patch} (98%) rename patches/server/{0095-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch => 0094-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch} (100%) rename patches/server/{0096-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch => 0095-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch} (100%) rename patches/server/{0097-Paper-PR-Throttle-failed-spawn-attempts.patch => 0096-Paper-PR-Throttle-failed-spawn-attempts.patch} (100%) rename patches/server/{0098-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch => 0097-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch} (100%) rename patches/server/{0099-Dont-send-useless-entity-packets.patch => 0098-Dont-send-useless-entity-packets.patch} (100%) diff --git a/patches/server/0068-Block-log4j-rce-exploit-in-chat.patch b/patches/removed/server/0068-Block-log4j-rce-exploit-in-chat.patch similarity index 99% rename from patches/server/0068-Block-log4j-rce-exploit-in-chat.patch rename to patches/removed/server/0068-Block-log4j-rce-exploit-in-chat.patch index 6fb5c8d7..1d82eb3f 100644 --- a/patches/server/0068-Block-log4j-rce-exploit-in-chat.patch +++ b/patches/removed/server/0068-Block-log4j-rce-exploit-in-chat.patch @@ -3,6 +3,7 @@ From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Sat, 9 Mar 2024 10:54:59 -0500 Subject: [PATCH] Block log4j rce exploit in chat +Removed since 1.21.1, useless diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java index 212074a4e26fd124705bbd4ac7bb4e25f3cbf2f9..fe9fc8f1f738531ead36bf8ccd1181a4df8afe9e 100644 diff --git a/patches/server/0069-Cache-player-profileResult.patch b/patches/server/0068-Cache-player-profileResult.patch similarity index 100% rename from patches/server/0069-Cache-player-profileResult.patch rename to patches/server/0068-Cache-player-profileResult.patch diff --git a/patches/server/0070-Prevent-change-non-editable-sign-warning-spam-in-con.patch b/patches/server/0069-Prevent-change-non-editable-sign-warning-spam-in-con.patch similarity index 100% rename from patches/server/0070-Prevent-change-non-editable-sign-warning-spam-in-con.patch rename to patches/server/0069-Prevent-change-non-editable-sign-warning-spam-in-con.patch diff --git a/patches/server/0071-Matter-Secure-Seed.patch b/patches/server/0070-Matter-Secure-Seed.patch similarity index 99% rename from patches/server/0071-Matter-Secure-Seed.patch rename to patches/server/0070-Matter-Secure-Seed.patch index 249dc51e..d4e5b9f7 100644 --- a/patches/server/0071-Matter-Secure-Seed.patch +++ b/patches/server/0070-Matter-Secure-Seed.patch @@ -450,7 +450,7 @@ index 45e262308aebafa377a2353661acdd122933b99e..96b9e91997bba777ebe868ca5ab5e5e9 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 85e78570ca4ac27e7bcb4ce876b8d90eb586a75b..203b8a1c06aa9bfa0a54fcbf1c90dea0134af16e 100644 +index e391461802132d40ab65d4d339b0e438a49b2948..6c1794a9cf1b90db70d3ec049b4ba81bbf0a0a24 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1400,7 +1400,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0072-Matter-Seed-Command.patch b/patches/server/0071-Matter-Seed-Command.patch similarity index 100% rename from patches/server/0072-Matter-Seed-Command.patch rename to patches/server/0071-Matter-Seed-Command.patch diff --git a/patches/server/0073-Ignore-terminal-provider-warning.patch b/patches/server/0072-Ignore-terminal-provider-warning.patch similarity index 100% rename from patches/server/0073-Ignore-terminal-provider-warning.patch rename to patches/server/0072-Ignore-terminal-provider-warning.patch diff --git a/patches/server/0074-Fix-console-freeze-above-JAVA-22.patch b/patches/server/0073-Fix-console-freeze-above-JAVA-22.patch similarity index 100% rename from patches/server/0074-Fix-console-freeze-above-JAVA-22.patch rename to patches/server/0073-Fix-console-freeze-above-JAVA-22.patch diff --git a/patches/server/0075-Fix-console-output-display-on-Pterodactyl-panel.patch b/patches/server/0074-Fix-console-output-display-on-Pterodactyl-panel.patch similarity index 100% rename from patches/server/0075-Fix-console-output-display-on-Pterodactyl-panel.patch rename to patches/server/0074-Fix-console-output-display-on-Pterodactyl-panel.patch diff --git a/patches/server/0076-Faster-Random-Generator.patch b/patches/server/0075-Faster-Random-Generator.patch similarity index 100% rename from patches/server/0076-Faster-Random-Generator.patch rename to patches/server/0075-Faster-Random-Generator.patch diff --git a/patches/server/0077-Don-t-save-primed-tnt-entity.patch b/patches/server/0076-Don-t-save-primed-tnt-entity.patch similarity index 100% rename from patches/server/0077-Don-t-save-primed-tnt-entity.patch rename to patches/server/0076-Don-t-save-primed-tnt-entity.patch diff --git a/patches/server/0078-Don-t-save-falling-block-entity.patch b/patches/server/0077-Don-t-save-falling-block-entity.patch similarity index 100% rename from patches/server/0078-Don-t-save-falling-block-entity.patch rename to patches/server/0077-Don-t-save-falling-block-entity.patch diff --git a/patches/server/0079-Configurable-connection-message.patch b/patches/server/0078-Configurable-connection-message.patch similarity index 100% rename from patches/server/0079-Configurable-connection-message.patch rename to patches/server/0078-Configurable-connection-message.patch diff --git a/patches/server/0080-Configurable-unknown-command-message.patch b/patches/server/0079-Configurable-unknown-command-message.patch similarity index 100% rename from patches/server/0080-Configurable-unknown-command-message.patch rename to patches/server/0079-Configurable-unknown-command-message.patch diff --git a/patches/server/0081-Remove-stream-in-BlockBehaviour-cache-blockstate.patch b/patches/server/0080-Remove-stream-in-BlockBehaviour-cache-blockstate.patch similarity index 100% rename from patches/server/0081-Remove-stream-in-BlockBehaviour-cache-blockstate.patch rename to patches/server/0080-Remove-stream-in-BlockBehaviour-cache-blockstate.patch diff --git a/patches/server/0082-Reduce-worldgen-allocations.patch b/patches/server/0081-Reduce-worldgen-allocations.patch similarity index 100% rename from patches/server/0082-Reduce-worldgen-allocations.patch rename to patches/server/0081-Reduce-worldgen-allocations.patch diff --git a/patches/server/0083-Fix-MC-183518.patch b/patches/server/0082-Fix-MC-183518.patch similarity index 100% rename from patches/server/0083-Fix-MC-183518.patch rename to patches/server/0082-Fix-MC-183518.patch diff --git a/patches/server/0084-Use-caffeine-cache-kickPermission-instead-of-using-g.patch b/patches/server/0083-Use-caffeine-cache-kickPermission-instead-of-using-g.patch similarity index 96% rename from patches/server/0084-Use-caffeine-cache-kickPermission-instead-of-using-g.patch rename to patches/server/0083-Use-caffeine-cache-kickPermission-instead-of-using-g.patch index 6370d914..335800d1 100644 --- a/patches/server/0084-Use-caffeine-cache-kickPermission-instead-of-using-g.patch +++ b/patches/server/0083-Use-caffeine-cache-kickPermission-instead-of-using-g.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use caffeine cache kickPermission instead of using diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index fe9fc8f1f738531ead36bf8ccd1181a4df8afe9e..855fa46cbaaa22003f46e0e63292ad0824d23c86 100644 +index 212074a4e26fd124705bbd4ac7bb4e25f3cbf2f9..091580c23138fc260f3aa898aa0f4a247c705293 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -339,17 +339,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0085-Do-not-place-player-if-the-server-is-full.patch b/patches/server/0084-Do-not-place-player-if-the-server-is-full.patch similarity index 100% rename from patches/server/0085-Do-not-place-player-if-the-server-is-full.patch rename to patches/server/0084-Do-not-place-player-if-the-server-is-full.patch diff --git a/patches/server/0086-Fix-MC-200418.patch b/patches/server/0085-Fix-MC-200418.patch similarity index 100% rename from patches/server/0086-Fix-MC-200418.patch rename to patches/server/0085-Fix-MC-200418.patch diff --git a/patches/server/0087-Fix-MC-119417.patch b/patches/server/0086-Fix-MC-119417.patch similarity index 100% rename from patches/server/0087-Fix-MC-119417.patch rename to patches/server/0086-Fix-MC-119417.patch diff --git a/patches/server/0088-Fix-MC-223153.patch b/patches/server/0087-Fix-MC-223153.patch similarity index 100% rename from patches/server/0088-Fix-MC-223153.patch rename to patches/server/0087-Fix-MC-223153.patch diff --git a/patches/server/0089-Optimize-LeavesProtocolManager-init-protocol.patch b/patches/server/0088-Optimize-LeavesProtocolManager-init-protocol.patch similarity index 100% rename from patches/server/0089-Optimize-LeavesProtocolManager-init-protocol.patch rename to patches/server/0088-Optimize-LeavesProtocolManager-init-protocol.patch diff --git a/patches/server/0090-Optimize-check-nearby-fire-or-lava-on-entity-move.patch b/patches/server/0089-Optimize-check-nearby-fire-or-lava-on-entity-move.patch similarity index 100% rename from patches/server/0090-Optimize-check-nearby-fire-or-lava-on-entity-move.patch rename to patches/server/0089-Optimize-check-nearby-fire-or-lava-on-entity-move.patch diff --git a/patches/server/0091-Airplane-Remove-streams-in-PoiCompetitorScan.patch b/patches/server/0090-Airplane-Remove-streams-in-PoiCompetitorScan.patch similarity index 100% rename from patches/server/0091-Airplane-Remove-streams-in-PoiCompetitorScan.patch rename to patches/server/0090-Airplane-Remove-streams-in-PoiCompetitorScan.patch diff --git a/patches/server/0092-Cache-CraftEntityType-minecraftToBukkit-convert.patch b/patches/server/0091-Cache-CraftEntityType-minecraftToBukkit-convert.patch similarity index 100% rename from patches/server/0092-Cache-CraftEntityType-minecraftToBukkit-convert.patch rename to patches/server/0091-Cache-CraftEntityType-minecraftToBukkit-convert.patch diff --git a/patches/server/0093-Configurable-player-knockback-zombie.patch b/patches/server/0092-Configurable-player-knockback-zombie.patch similarity index 97% rename from patches/server/0093-Configurable-player-knockback-zombie.patch rename to patches/server/0092-Configurable-player-knockback-zombie.patch index 19051ccc..528881a7 100644 --- a/patches/server/0093-Configurable-player-knockback-zombie.patch +++ b/patches/server/0092-Configurable-player-knockback-zombie.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable player knockback zombie diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 7c75298c8ea7a828c2d9cd4e7ffd4d09a0113aed..8b0cd878d8bf633283b645dc06dfbb98c06e269f 100644 +index 69bd415f00f5b604b6de7b55bc2fcbbac6b69ee5..3503423ee0d4ed13f7ebdb8272c8266a827ff4c1 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2028,6 +2028,8 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0094-Hide-specified-item-components-to-clients.patch b/patches/server/0093-Hide-specified-item-components-to-clients.patch similarity index 98% rename from patches/server/0094-Hide-specified-item-components-to-clients.patch rename to patches/server/0093-Hide-specified-item-components-to-clients.patch index 6a2e21bb..7c0f07c1 100644 --- a/patches/server/0094-Hide-specified-item-components-to-clients.patch +++ b/patches/server/0093-Hide-specified-item-components-to-clients.patch @@ -65,10 +65,10 @@ index 573c380e123473e35c0b72c44b32c8d6ba8e61c6..feacc41ecf7f4028e0a1cce5d2012ced } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 855fa46cbaaa22003f46e0e63292ad0824d23c86..60ef9bf2425a8d6d54cd59ae15f3f3780924a977 100644 +index 091580c23138fc260f3aa898aa0f4a247c705293..0b9ee7be6172d6fbe3e2757ed8f88ad7f649919f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2858,7 +2858,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2847,7 +2847,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl entity.refreshEntityData(ServerGamePacketListenerImpl.this.player); // SPIGOT-7136 - Allays if (entity instanceof Allay) { @@ -78,7 +78,7 @@ index 855fa46cbaaa22003f46e0e63292ad0824d23c86..60ef9bf2425a8d6d54cd59ae15f3f378 } } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 8b0cd878d8bf633283b645dc06dfbb98c06e269f..bddfa152954b8ecdf5da233939f286f32e0b30e4 100644 +index 3503423ee0d4ed13f7ebdb8272c8266a827ff4c1..341fad1609308fad6adf5b5f9ad289d57ac4ddd6 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3404,7 +3404,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0095-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch b/patches/server/0094-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch similarity index 100% rename from patches/server/0095-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch rename to patches/server/0094-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch diff --git a/patches/server/0096-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch b/patches/server/0095-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch similarity index 100% rename from patches/server/0096-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch rename to patches/server/0095-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch diff --git a/patches/server/0097-Paper-PR-Throttle-failed-spawn-attempts.patch b/patches/server/0096-Paper-PR-Throttle-failed-spawn-attempts.patch similarity index 100% rename from patches/server/0097-Paper-PR-Throttle-failed-spawn-attempts.patch rename to patches/server/0096-Paper-PR-Throttle-failed-spawn-attempts.patch diff --git a/patches/server/0098-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch b/patches/server/0097-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch similarity index 100% rename from patches/server/0098-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch rename to patches/server/0097-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch diff --git a/patches/server/0099-Dont-send-useless-entity-packets.patch b/patches/server/0098-Dont-send-useless-entity-packets.patch similarity index 100% rename from patches/server/0099-Dont-send-useless-entity-packets.patch rename to patches/server/0098-Dont-send-useless-entity-packets.patch