From 32cf791cac29030e0775b06c384b8ff86a59e65b Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Sun, 16 Jun 2024 14:55:12 -0500 Subject: [PATCH] Update Paper --- gradle.properties | 2 +- .../0013-Block-server-side-chunkbans.patch | 180 ------------------ ...s-with-invalid-namespaces-from-bein.patch} | 0 ...ry-player-data-in-the-nbt-component.patch} | 0 ...tring-tag-visitors-to-1024-elements.patch} | 0 ...lling-potion-effects-and-certain-po.patch} | 0 ...ch => 0017-Fix-negative-death-times.patch} | 0 ...ehicle-collision-checks-to-3-and-di.patch} | 0 ...Add-custom-classes-used-by-Scissors.patch} | 0 ...-Don-t-log-invalid-teams-to-console.patch} | 0 ...-bounds-HangingEntity-crash-exploit.patch} | 0 ...ch => 0022-Add-MasterBlockFireEvent.patch} | 0 ...tags.patch => 0023-Reset-large-tags.patch} | 0 ...> 0024-Add-spectator-teleport-event.patch} | 2 +- ...25-Prevent-invalid-container-events.patch} | 2 +- ...unning-commands-in-books-by-default.patch} | 0 ...k-entity-entity-tag-query-positions.patch} | 2 +- ...-legacy-messages-over-1k-characters.patch} | 0 ...ents-on-Signs-bypassing-permissions.patch} | 0 ...tch => 0030-Prevent-velocity-freeze.patch} | 0 ...Patch-large-selector-distance-crash.patch} | 0 ...ch-invalid-entity-rotation-log-spam.patch} | 0 ...mit-sculk-catalyst-cursor-positions.patch} | 0 ...n-option-to-disable-chat-signatures.patch} | 0 ...patch => 0035-Limit-map-decorations.patch} | 0 ...layer-banning-using-duplicate-UUIDs.patch} | 0 ...on-t-warn-on-duplicate-entity-UUIDs.patch} | 0 ...ch => 0038-Limit-beacon-effectRange.patch} | 0 ...ove-validation-of-ResourceLocations.patch} | 0 ...n-t-log-on-too-many-chained-updates.patch} | 0 ...041-Fix-packet-related-lag-exploits.patch} | 2 +- ...0042-Implement-command-block-events.patch} | 2 +- ...-Limit-save-data-for-Bees-and-Vexes.patch} | 0 ...tch => 0044-Add-depth-limit-to-SNBT.patch} | 0 ...tch => 0045-Mute-invalid-attributes.patch} | 0 ...046-Mute-invalid-Enderdragon-phases.patch} | 2 +- ...dd-length-limit-to-note-block-sound.patch} | 0 ... 0048-Change-version-fetcher-to-AMG.patch} | 0 ...-limit-to-Component-deserialization.patch} | 0 ...limit-to-updateCustomBlockEntityTag.patch} | 0 40 files changed, 7 insertions(+), 187 deletions(-) delete mode 100644 patches/server/0013-Block-server-side-chunkbans.patch rename patches/server/{0014-Prevent-attributes-with-invalid-namespaces-from-bein.patch => 0013-Prevent-attributes-with-invalid-namespaces-from-bein.patch} (100%) rename patches/server/{0015-Don-t-query-player-data-in-the-nbt-component.patch => 0014-Don-t-query-player-data-in-the-nbt-component.patch} (100%) rename patches/server/{0016-Limit-string-tag-visitors-to-1024-elements.patch => 0015-Limit-string-tag-visitors-to-1024-elements.patch} (100%) rename patches/server/{0017-Fixes-creative-killing-potion-effects-and-certain-po.patch => 0016-Fixes-creative-killing-potion-effects-and-certain-po.patch} (100%) rename patches/server/{0018-Fix-negative-death-times.patch => 0017-Fix-negative-death-times.patch} (100%) rename patches/server/{0019-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch => 0018-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch} (100%) rename patches/server/{0020-Add-custom-classes-used-by-Scissors.patch => 0019-Add-custom-classes-used-by-Scissors.patch} (100%) rename patches/server/{0021-Don-t-log-invalid-teams-to-console.patch => 0020-Don-t-log-invalid-teams-to-console.patch} (100%) rename patches/server/{0022-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch => 0021-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch} (100%) rename patches/server/{0023-Add-MasterBlockFireEvent.patch => 0022-Add-MasterBlockFireEvent.patch} (100%) rename patches/server/{0024-Reset-large-tags.patch => 0023-Reset-large-tags.patch} (100%) rename patches/server/{0025-Add-spectator-teleport-event.patch => 0024-Add-spectator-teleport-event.patch} (94%) rename patches/server/{0026-Prevent-invalid-container-events.patch => 0025-Prevent-invalid-container-events.patch} (95%) rename patches/server/{0027-Disable-running-commands-in-books-by-default.patch => 0026-Disable-running-commands-in-books-by-default.patch} (100%) rename patches/server/{0028-Validate-block-entity-entity-tag-query-positions.patch => 0027-Validate-block-entity-entity-tag-query-positions.patch} (95%) rename patches/server/{0029-Refuse-to-convert-legacy-messages-over-1k-characters.patch => 0028-Refuse-to-convert-legacy-messages-over-1k-characters.patch} (100%) rename patches/server/{0030-Fix-ClickEvents-on-Signs-bypassing-permissions.patch => 0029-Fix-ClickEvents-on-Signs-bypassing-permissions.patch} (100%) rename patches/server/{0031-Prevent-velocity-freeze.patch => 0030-Prevent-velocity-freeze.patch} (100%) rename patches/server/{0032-Patch-large-selector-distance-crash.patch => 0031-Patch-large-selector-distance-crash.patch} (100%) rename patches/server/{0033-Patch-invalid-entity-rotation-log-spam.patch => 0032-Patch-invalid-entity-rotation-log-spam.patch} (100%) rename patches/server/{0034-Limit-sculk-catalyst-cursor-positions.patch => 0033-Limit-sculk-catalyst-cursor-positions.patch} (100%) rename patches/server/{0035-Add-configuration-option-to-disable-chat-signatures.patch => 0034-Add-configuration-option-to-disable-chat-signatures.patch} (100%) rename patches/server/{0036-Limit-map-decorations.patch => 0035-Limit-map-decorations.patch} (100%) rename patches/server/{0037-Prevent-player-banning-using-duplicate-UUIDs.patch => 0036-Prevent-player-banning-using-duplicate-UUIDs.patch} (100%) rename patches/server/{0038-Don-t-warn-on-duplicate-entity-UUIDs.patch => 0037-Don-t-warn-on-duplicate-entity-UUIDs.patch} (100%) rename patches/server/{0039-Limit-beacon-effectRange.patch => 0038-Limit-beacon-effectRange.patch} (100%) rename patches/server/{0040-Improve-validation-of-ResourceLocations.patch => 0039-Improve-validation-of-ResourceLocations.patch} (100%) rename patches/server/{0041-Don-t-log-on-too-many-chained-updates.patch => 0040-Don-t-log-on-too-many-chained-updates.patch} (100%) rename patches/server/{0042-Fix-packet-related-lag-exploits.patch => 0041-Fix-packet-related-lag-exploits.patch} (97%) rename patches/server/{0043-Implement-command-block-events.patch => 0042-Implement-command-block-events.patch} (97%) rename patches/server/{0044-Limit-save-data-for-Bees-and-Vexes.patch => 0043-Limit-save-data-for-Bees-and-Vexes.patch} (100%) rename patches/server/{0045-Add-depth-limit-to-SNBT.patch => 0044-Add-depth-limit-to-SNBT.patch} (100%) rename patches/server/{0046-Mute-invalid-attributes.patch => 0045-Mute-invalid-attributes.patch} (100%) rename patches/server/{0047-Mute-invalid-Enderdragon-phases.patch => 0046-Mute-invalid-Enderdragon-phases.patch} (96%) rename patches/server/{0048-Add-length-limit-to-note-block-sound.patch => 0047-Add-length-limit-to-note-block-sound.patch} (100%) rename patches/server/{0049-Change-version-fetcher-to-AMG.patch => 0048-Change-version-fetcher-to-AMG.patch} (100%) rename patches/server/{0050-Add-depth-limit-to-Component-deserialization.patch => 0049-Add-depth-limit-to-Component-deserialization.patch} (100%) rename patches/server/{0051-Add-depth-limit-to-updateCustomBlockEntityTag.patch => 0050-Add-depth-limit-to-updateCustomBlockEntityTag.patch} (100%) diff --git a/gradle.properties b/gradle.properties index ffe46a5..5626fde 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.20.4-R0.1-SNAPSHOT mcVersion=1.20.4 -paperRef=f4c7d373e4a1aff23539fe099745bf29a28559b9 +paperRef=ba31f4128208e954d6648001724887352f71ece9 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0013-Block-server-side-chunkbans.patch b/patches/server/0013-Block-server-side-chunkbans.patch deleted file mode 100644 index ae390a5..0000000 --- a/patches/server/0013-Block-server-side-chunkbans.patch +++ /dev/null @@ -1,180 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: ayunami2000 -Date: Thu, 25 Jan 2024 23:48:51 -0600 -Subject: [PATCH] Block server-side chunkbans - - -diff --git a/src/main/java/net/minecraft/network/PacketEncoder.java b/src/main/java/net/minecraft/network/PacketEncoder.java -index 96d5448019d53ac3575e209c1c5c223a62a2638d..d0cfc4fc00d45c91380d2d794ca816db74d40266 100644 ---- a/src/main/java/net/minecraft/network/PacketEncoder.java -+++ b/src/main/java/net/minecraft/network/PacketEncoder.java -@@ -7,8 +7,17 @@ import io.netty.handler.codec.MessageToByteEncoder; - import io.netty.util.Attribute; - import io.netty.util.AttributeKey; - import java.io.IOException; -+import java.util.Collections; -+ -+import net.minecraft.ChatFormatting; -+import net.minecraft.core.NonNullList; -+import net.minecraft.nbt.CompoundTag; -+import net.minecraft.network.chat.Component; -+import net.minecraft.network.chat.SignedMessageBody; - import net.minecraft.network.protocol.Packet; -+import net.minecraft.network.protocol.game.*; - import net.minecraft.util.profiling.jfr.JvmProfiler; -+import net.minecraft.world.item.ItemStack; - import org.slf4j.Logger; - - public class PacketEncoder extends MessageToByteEncoder> { -@@ -19,6 +28,23 @@ public class PacketEncoder extends MessageToByteEncoder> { - this.codecKey = protocolKey; - } - -+ // Scissors start -+ private int tryWrite(Packet packet, FriendlyByteBuf friendlyByteBuf, ChannelHandlerContext channelHandlerContext, int i) { -+ friendlyByteBuf.writeVarInt(i); -+ friendlyByteBuf.adventure$locale = channelHandlerContext.channel().attr(io.papermc.paper.adventure.PaperAdventure.LOCALE_ATTRIBUTE).get(); // Paper -+ -+ int j = friendlyByteBuf.writerIndex(); -+ packet.write(friendlyByteBuf); -+ int k = friendlyByteBuf.writerIndex() - j; -+ int packetLength = friendlyByteBuf.readableBytes(); -+ if (packetLength > MAX_PACKET_SIZE) { -+ throw new PacketTooLargeException(packet, this.codecKey, packetLength); -+ } -+ -+ return k; -+ } -+ // Scissors end -+ - protected void encode(ChannelHandlerContext channelHandlerContext, Packet packet, ByteBuf byteBuf) throws Exception { - Attribute> attribute = channelHandlerContext.channel().attr(this.codecKey); - ConnectionProtocol.CodecData codecData = attribute.get(); -@@ -34,45 +60,58 @@ public class PacketEncoder extends MessageToByteEncoder> { - throw new IOException("Can't serialize unregistered packet"); - } else { - FriendlyByteBuf friendlyByteBuf = new FriendlyByteBuf(byteBuf); -- friendlyByteBuf.writeVarInt(i); -- friendlyByteBuf.adventure$locale = channelHandlerContext.channel().attr(io.papermc.paper.adventure.PaperAdventure.LOCALE_ATTRIBUTE).get(); // Paper - adventure; set player's locale - -+ // Scissors start -+ int k; - try { -- int j = friendlyByteBuf.writerIndex(); -- packet.write(friendlyByteBuf); -- int k = friendlyByteBuf.writerIndex() - j; -- if (false && k > 8388608) { // Paper - Handle large packets disconnecting client; disable -- throw new IllegalArgumentException("Packet too big (is " + k + ", should be less than 8388608): " + packet); -- } -- -- JvmProfiler.INSTANCE.onPacketSent(codecData.protocol(), i, channelHandlerContext.channel().remoteAddress(), k); -+ k = this.tryWrite(packet, friendlyByteBuf, channelHandlerContext, i); - } catch (Throwable var13) { -- // Paper start - Give proper error message -- String packetName = io.papermc.paper.util.ObfHelper.INSTANCE.deobfClassName(packet.getClass().getName()); -- if (packetName.contains(".")) { -- packetName = packetName.substring(packetName.lastIndexOf(".") + 1); -+ packet = capPacket(packet, i); -+ if (packet == null) { -+ throw new SkipPacketException(new IllegalArgumentException("Packet too big: " + packet)); - } -- -- LOGGER.error("Packet encoding of packet {} (ID: {}) threw (skippable? {})", packetName, i, packet.isSkippable(), var13); -- // Paper end -- if (packet.isSkippable()) { -- throw new SkipPacketException(var13); -- } -- -- throw var13; -- } finally { -- // Paper start - Handle large packets disconnecting client -- int packetLength = friendlyByteBuf.readableBytes(); -- if (packetLength > MAX_PACKET_SIZE) { -- throw new PacketTooLargeException(packet, this.codecKey, packetLength); -- } -- // Paper end - Handle large packets disconnecting client -- ProtocolSwapHandler.swapProtocolIfNeeded(attribute, packet); -+ friendlyByteBuf.clear(); -+ k = this.tryWrite(packet, friendlyByteBuf, channelHandlerContext, i); - } -+ JvmProfiler.INSTANCE.onPacketSent(codecData.protocol(), i, channelHandlerContext.channel().remoteAddress(), k); -+ ProtocolSwapHandler.swapProtocolIfNeeded(attribute, packet); -+ // Scissors end - } - } - } - -+ // Scissors start -+ private static Packet capPacket(Packet packet, int i) { -+ if (packet instanceof ClientboundBlockEntityDataPacket blockEntityDataPacket) { -+ packet = new ClientboundBlockEntityDataPacket(blockEntityDataPacket.getPos(), blockEntityDataPacket.getType(), new CompoundTag()); -+ } else if (packet instanceof ClientboundLevelChunkPacketData chunkPacket) { -+ chunkPacket.clearNBT(); -+ } else if (packet instanceof ClientboundContainerSetContentPacket containerSetContentPacket) { -+ packet = new ClientboundContainerSetContentPacket(containerSetContentPacket.getContainerId(), containerSetContentPacket.getStateId(), NonNullList.create(), ItemStack.EMPTY); -+ } else if (packet instanceof ClientboundSetEquipmentPacket setEquipmentPacket) { -+ packet = new ClientboundSetEquipmentPacket(setEquipmentPacket.getEntity(), Collections.emptyList()); -+ } else if (packet instanceof ClientboundContainerSetSlotPacket containerSetSlotPacket) { -+ packet = new ClientboundContainerSetSlotPacket(containerSetSlotPacket.getContainerId(), containerSetSlotPacket.getStateId(), containerSetSlotPacket.getSlot(), ItemStack.EMPTY); -+ } else if (packet instanceof ClientboundMapItemDataPacket mapItemDataPacket) { -+ packet = new ClientboundMapItemDataPacket(mapItemDataPacket.getMapId(), mapItemDataPacket.getScale(), mapItemDataPacket.isLocked(), null, null); -+ } else if (packet instanceof ClientboundPlayerChatPacket playerChatPacket) { -+ final SignedMessageBody.Packed body = playerChatPacket.body(); -+ packet = new ClientboundPlayerChatPacket(playerChatPacket.sender(), // Not sending this packet results in a kick when someone says something. -+ playerChatPacket.index(), -+ playerChatPacket.signature(), -+ playerChatPacket.body(), -+ Component.empty().append("** Message too large **").withStyle(ChatFormatting.RED), -+ playerChatPacket.filterMask(), -+ playerChatPacket.chatType() -+ ); -+ } else { -+ return null; -+ } -+ -+ return packet; -+ } -+ // Scissors end -+ - // Paper start - private static int MAX_PACKET_SIZE = 8388608; - -diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java -index 3944852921335c78a04a9dc301882ab5b152b1ed..96ee53c7cc862e059328c5cdf5e07f309df6a79e 100644 ---- a/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java -+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java -@@ -24,7 +24,7 @@ public class ClientboundBlockEntityDataPacket implements Packet blockEntityType, CompoundTag nbt) { -+ public ClientboundBlockEntityDataPacket(BlockPos pos, BlockEntityType blockEntityType, CompoundTag nbt) { // Scissors - private -> public - this.pos = pos; - this.type = blockEntityType; - this.tag = nbt.isEmpty() ? null : nbt; -diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java -index 76bde683d193b37e563a67c1c7b9bdcf17d64524..185aa88ff28e6f3e3314abe19dff88609a47334e 100644 ---- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java -+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java -@@ -33,6 +33,13 @@ public class ClientboundLevelChunkPacketData { - } - // Paper end - Handle oversized block entities in chunks - -+ // Scissors start -+ public void clearNBT() { -+ this.blockEntitiesData.clear(); -+ this.extraPackets.clear(); -+ } -+ // Scissors end -+ - // Paper start - Anti-Xray - Add chunk packet info - @Deprecated @io.papermc.paper.annotation.DoNotUse public ClientboundLevelChunkPacketData(LevelChunk chunk) { this(chunk, null); } - public ClientboundLevelChunkPacketData(LevelChunk chunk, com.destroystokyo.paper.antixray.ChunkPacketInfo chunkPacketInfo) { -@@ -58,6 +65,7 @@ public class ClientboundLevelChunkPacketData { - int totalTileEntities = 0; // Paper - Handle oversized block entities in chunks - - for (Entry entry2 : chunk.getBlockEntities().entrySet()) { -+ if (this.extraPackets.size() > 50) break; // Scissors - Limit extraPackets size - // Paper start - Handle oversized block entities in chunks - if (++totalTileEntities > TE_LIMIT) { - var packet = entry2.getValue().getUpdatePacket(); diff --git a/patches/server/0014-Prevent-attributes-with-invalid-namespaces-from-bein.patch b/patches/server/0013-Prevent-attributes-with-invalid-namespaces-from-bein.patch similarity index 100% rename from patches/server/0014-Prevent-attributes-with-invalid-namespaces-from-bein.patch rename to patches/server/0013-Prevent-attributes-with-invalid-namespaces-from-bein.patch diff --git a/patches/server/0015-Don-t-query-player-data-in-the-nbt-component.patch b/patches/server/0014-Don-t-query-player-data-in-the-nbt-component.patch similarity index 100% rename from patches/server/0015-Don-t-query-player-data-in-the-nbt-component.patch rename to patches/server/0014-Don-t-query-player-data-in-the-nbt-component.patch diff --git a/patches/server/0016-Limit-string-tag-visitors-to-1024-elements.patch b/patches/server/0015-Limit-string-tag-visitors-to-1024-elements.patch similarity index 100% rename from patches/server/0016-Limit-string-tag-visitors-to-1024-elements.patch rename to patches/server/0015-Limit-string-tag-visitors-to-1024-elements.patch diff --git a/patches/server/0017-Fixes-creative-killing-potion-effects-and-certain-po.patch b/patches/server/0016-Fixes-creative-killing-potion-effects-and-certain-po.patch similarity index 100% rename from patches/server/0017-Fixes-creative-killing-potion-effects-and-certain-po.patch rename to patches/server/0016-Fixes-creative-killing-potion-effects-and-certain-po.patch diff --git a/patches/server/0018-Fix-negative-death-times.patch b/patches/server/0017-Fix-negative-death-times.patch similarity index 100% rename from patches/server/0018-Fix-negative-death-times.patch rename to patches/server/0017-Fix-negative-death-times.patch diff --git a/patches/server/0019-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch b/patches/server/0018-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch similarity index 100% rename from patches/server/0019-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch rename to patches/server/0018-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch diff --git a/patches/server/0020-Add-custom-classes-used-by-Scissors.patch b/patches/server/0019-Add-custom-classes-used-by-Scissors.patch similarity index 100% rename from patches/server/0020-Add-custom-classes-used-by-Scissors.patch rename to patches/server/0019-Add-custom-classes-used-by-Scissors.patch diff --git a/patches/server/0021-Don-t-log-invalid-teams-to-console.patch b/patches/server/0020-Don-t-log-invalid-teams-to-console.patch similarity index 100% rename from patches/server/0021-Don-t-log-invalid-teams-to-console.patch rename to patches/server/0020-Don-t-log-invalid-teams-to-console.patch diff --git a/patches/server/0022-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch b/patches/server/0021-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch similarity index 100% rename from patches/server/0022-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch rename to patches/server/0021-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch diff --git a/patches/server/0023-Add-MasterBlockFireEvent.patch b/patches/server/0022-Add-MasterBlockFireEvent.patch similarity index 100% rename from patches/server/0023-Add-MasterBlockFireEvent.patch rename to patches/server/0022-Add-MasterBlockFireEvent.patch diff --git a/patches/server/0024-Reset-large-tags.patch b/patches/server/0023-Reset-large-tags.patch similarity index 100% rename from patches/server/0024-Reset-large-tags.patch rename to patches/server/0023-Reset-large-tags.patch diff --git a/patches/server/0025-Add-spectator-teleport-event.patch b/patches/server/0024-Add-spectator-teleport-event.patch similarity index 94% rename from patches/server/0025-Add-spectator-teleport-event.patch rename to patches/server/0024-Add-spectator-teleport-event.patch index 2a60d61..59374ed 100644 --- a/patches/server/0025-Add-spectator-teleport-event.patch +++ b/patches/server/0024-Add-spectator-teleport-event.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add spectator teleport event diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 860d33ac56680babd87358b1d7d2216dac3f7865..a60f594b3d7c8c30344f5e888e4309b8f75fdeaf 100644 +index fe2ef36ab5dc4b933abf24dbfd0e811c53239cf0..f14e5f5867b0319c1f3f25ac607ac5e2b0992991 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1,5 +1,6 @@ diff --git a/patches/server/0026-Prevent-invalid-container-events.patch b/patches/server/0025-Prevent-invalid-container-events.patch similarity index 95% rename from patches/server/0026-Prevent-invalid-container-events.patch rename to patches/server/0025-Prevent-invalid-container-events.patch index 04fbdd5..ed6eb34 100644 --- a/patches/server/0026-Prevent-invalid-container-events.patch +++ b/patches/server/0025-Prevent-invalid-container-events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent invalid container events diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a60f594b3d7c8c30344f5e888e4309b8f75fdeaf..cfe4f98458c1b1fd311535552b99937d1f319c0e 100644 +index f14e5f5867b0319c1f3f25ac607ac5e2b0992991..4582ef637075e64c0b6ff234d3c0cd30ba074b38 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -29,6 +29,7 @@ import java.util.function.UnaryOperator; diff --git a/patches/server/0027-Disable-running-commands-in-books-by-default.patch b/patches/server/0026-Disable-running-commands-in-books-by-default.patch similarity index 100% rename from patches/server/0027-Disable-running-commands-in-books-by-default.patch rename to patches/server/0026-Disable-running-commands-in-books-by-default.patch diff --git a/patches/server/0028-Validate-block-entity-entity-tag-query-positions.patch b/patches/server/0027-Validate-block-entity-entity-tag-query-positions.patch similarity index 95% rename from patches/server/0028-Validate-block-entity-entity-tag-query-positions.patch rename to patches/server/0027-Validate-block-entity-entity-tag-query-positions.patch index 36a4372..237a582 100644 --- a/patches/server/0028-Validate-block-entity-entity-tag-query-positions.patch +++ b/patches/server/0027-Validate-block-entity-entity-tag-query-positions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Validate block entity/entity tag query positions diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index cfe4f98458c1b1fd311535552b99937d1f319c0e..adbb1036913ba6299f2093c84480e4147a36b344 100644 +index 4582ef637075e64c0b6ff234d3c0cd30ba074b38..80f0f88258770862f419e4faba4cfca4c0457b2c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1278,7 +1278,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0029-Refuse-to-convert-legacy-messages-over-1k-characters.patch b/patches/server/0028-Refuse-to-convert-legacy-messages-over-1k-characters.patch similarity index 100% rename from patches/server/0029-Refuse-to-convert-legacy-messages-over-1k-characters.patch rename to patches/server/0028-Refuse-to-convert-legacy-messages-over-1k-characters.patch diff --git a/patches/server/0030-Fix-ClickEvents-on-Signs-bypassing-permissions.patch b/patches/server/0029-Fix-ClickEvents-on-Signs-bypassing-permissions.patch similarity index 100% rename from patches/server/0030-Fix-ClickEvents-on-Signs-bypassing-permissions.patch rename to patches/server/0029-Fix-ClickEvents-on-Signs-bypassing-permissions.patch diff --git a/patches/server/0031-Prevent-velocity-freeze.patch b/patches/server/0030-Prevent-velocity-freeze.patch similarity index 100% rename from patches/server/0031-Prevent-velocity-freeze.patch rename to patches/server/0030-Prevent-velocity-freeze.patch diff --git a/patches/server/0032-Patch-large-selector-distance-crash.patch b/patches/server/0031-Patch-large-selector-distance-crash.patch similarity index 100% rename from patches/server/0032-Patch-large-selector-distance-crash.patch rename to patches/server/0031-Patch-large-selector-distance-crash.patch diff --git a/patches/server/0033-Patch-invalid-entity-rotation-log-spam.patch b/patches/server/0032-Patch-invalid-entity-rotation-log-spam.patch similarity index 100% rename from patches/server/0033-Patch-invalid-entity-rotation-log-spam.patch rename to patches/server/0032-Patch-invalid-entity-rotation-log-spam.patch diff --git a/patches/server/0034-Limit-sculk-catalyst-cursor-positions.patch b/patches/server/0033-Limit-sculk-catalyst-cursor-positions.patch similarity index 100% rename from patches/server/0034-Limit-sculk-catalyst-cursor-positions.patch rename to patches/server/0033-Limit-sculk-catalyst-cursor-positions.patch diff --git a/patches/server/0035-Add-configuration-option-to-disable-chat-signatures.patch b/patches/server/0034-Add-configuration-option-to-disable-chat-signatures.patch similarity index 100% rename from patches/server/0035-Add-configuration-option-to-disable-chat-signatures.patch rename to patches/server/0034-Add-configuration-option-to-disable-chat-signatures.patch diff --git a/patches/server/0036-Limit-map-decorations.patch b/patches/server/0035-Limit-map-decorations.patch similarity index 100% rename from patches/server/0036-Limit-map-decorations.patch rename to patches/server/0035-Limit-map-decorations.patch diff --git a/patches/server/0037-Prevent-player-banning-using-duplicate-UUIDs.patch b/patches/server/0036-Prevent-player-banning-using-duplicate-UUIDs.patch similarity index 100% rename from patches/server/0037-Prevent-player-banning-using-duplicate-UUIDs.patch rename to patches/server/0036-Prevent-player-banning-using-duplicate-UUIDs.patch diff --git a/patches/server/0038-Don-t-warn-on-duplicate-entity-UUIDs.patch b/patches/server/0037-Don-t-warn-on-duplicate-entity-UUIDs.patch similarity index 100% rename from patches/server/0038-Don-t-warn-on-duplicate-entity-UUIDs.patch rename to patches/server/0037-Don-t-warn-on-duplicate-entity-UUIDs.patch diff --git a/patches/server/0039-Limit-beacon-effectRange.patch b/patches/server/0038-Limit-beacon-effectRange.patch similarity index 100% rename from patches/server/0039-Limit-beacon-effectRange.patch rename to patches/server/0038-Limit-beacon-effectRange.patch diff --git a/patches/server/0040-Improve-validation-of-ResourceLocations.patch b/patches/server/0039-Improve-validation-of-ResourceLocations.patch similarity index 100% rename from patches/server/0040-Improve-validation-of-ResourceLocations.patch rename to patches/server/0039-Improve-validation-of-ResourceLocations.patch diff --git a/patches/server/0041-Don-t-log-on-too-many-chained-updates.patch b/patches/server/0040-Don-t-log-on-too-many-chained-updates.patch similarity index 100% rename from patches/server/0041-Don-t-log-on-too-many-chained-updates.patch rename to patches/server/0040-Don-t-log-on-too-many-chained-updates.patch diff --git a/patches/server/0042-Fix-packet-related-lag-exploits.patch b/patches/server/0041-Fix-packet-related-lag-exploits.patch similarity index 97% rename from patches/server/0042-Fix-packet-related-lag-exploits.patch rename to patches/server/0041-Fix-packet-related-lag-exploits.patch index 5601516..6215cde 100644 --- a/patches/server/0042-Fix-packet-related-lag-exploits.patch +++ b/patches/server/0041-Fix-packet-related-lag-exploits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix packet-related lag exploits diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8d5f4f2a0589c9c34dcff0ca95b6222b90f7d09a..88c98ba7673808819b8f85876f22743bc3a4f471 100644 +index c0aa9520d547d6d77169fd1dbb02844b90ef4a1d..843793437737305bbdec598326a813f84b820d12 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -865,7 +865,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0043-Implement-command-block-events.patch b/patches/server/0042-Implement-command-block-events.patch similarity index 97% rename from patches/server/0043-Implement-command-block-events.patch rename to patches/server/0042-Implement-command-block-events.patch index 1381ac3..37f82a4 100644 --- a/patches/server/0043-Implement-command-block-events.patch +++ b/patches/server/0042-Implement-command-block-events.patch @@ -18,7 +18,7 @@ index c99fc118013cb3d4043638e2001a8297e79ddf9c..cdaa81e1f2167b29ec01cc25e51a8400 private final boolean trackOutput; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 88c98ba7673808819b8f85876f22743bc3a4f471..f96c0c5007d9e1d86bfe27518815dc798e431c6a 100644 +index 843793437737305bbdec598326a813f84b820d12..bbe76d46b599fb2f8211f3e62a76430db120f66f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1,6 +1,8 @@ diff --git a/patches/server/0044-Limit-save-data-for-Bees-and-Vexes.patch b/patches/server/0043-Limit-save-data-for-Bees-and-Vexes.patch similarity index 100% rename from patches/server/0044-Limit-save-data-for-Bees-and-Vexes.patch rename to patches/server/0043-Limit-save-data-for-Bees-and-Vexes.patch diff --git a/patches/server/0045-Add-depth-limit-to-SNBT.patch b/patches/server/0044-Add-depth-limit-to-SNBT.patch similarity index 100% rename from patches/server/0045-Add-depth-limit-to-SNBT.patch rename to patches/server/0044-Add-depth-limit-to-SNBT.patch diff --git a/patches/server/0046-Mute-invalid-attributes.patch b/patches/server/0045-Mute-invalid-attributes.patch similarity index 100% rename from patches/server/0046-Mute-invalid-attributes.patch rename to patches/server/0045-Mute-invalid-attributes.patch diff --git a/patches/server/0047-Mute-invalid-Enderdragon-phases.patch b/patches/server/0046-Mute-invalid-Enderdragon-phases.patch similarity index 96% rename from patches/server/0047-Mute-invalid-Enderdragon-phases.patch rename to patches/server/0046-Mute-invalid-Enderdragon-phases.patch index f407865..d2c88b1 100644 --- a/patches/server/0047-Mute-invalid-Enderdragon-phases.patch +++ b/patches/server/0046-Mute-invalid-Enderdragon-phases.patch @@ -18,7 +18,7 @@ index 1b1a210a86121049e507a497649727a99452c0a2..a8bcadbf64d5034b172427e16b1468b4 } else if (this.timeSinceCharge > 0 && this.timeSinceCharge++ >= 10) { this.dragon.getPhaseManager().setPhase(EnderDragonPhase.HOLDING_PATTERN); diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java -index 13f60a16f07c50a278b158d64180009020a4dca6..289361cbaad2ca6392ee66627becb8f973bb1e54 100644 +index c5269c3117901b8521720d1b32689d7f600f20a3..3a8839ee4cb8cafb927ad49a9e8f9a2955eef973 100644 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java @@ -31,7 +31,7 @@ public class DragonStrafePlayerPhase extends AbstractDragonPhaseInstance { diff --git a/patches/server/0048-Add-length-limit-to-note-block-sound.patch b/patches/server/0047-Add-length-limit-to-note-block-sound.patch similarity index 100% rename from patches/server/0048-Add-length-limit-to-note-block-sound.patch rename to patches/server/0047-Add-length-limit-to-note-block-sound.patch diff --git a/patches/server/0049-Change-version-fetcher-to-AMG.patch b/patches/server/0048-Change-version-fetcher-to-AMG.patch similarity index 100% rename from patches/server/0049-Change-version-fetcher-to-AMG.patch rename to patches/server/0048-Change-version-fetcher-to-AMG.patch diff --git a/patches/server/0050-Add-depth-limit-to-Component-deserialization.patch b/patches/server/0049-Add-depth-limit-to-Component-deserialization.patch similarity index 100% rename from patches/server/0050-Add-depth-limit-to-Component-deserialization.patch rename to patches/server/0049-Add-depth-limit-to-Component-deserialization.patch diff --git a/patches/server/0051-Add-depth-limit-to-updateCustomBlockEntityTag.patch b/patches/server/0050-Add-depth-limit-to-updateCustomBlockEntityTag.patch similarity index 100% rename from patches/server/0051-Add-depth-limit-to-updateCustomBlockEntityTag.patch rename to patches/server/0050-Add-depth-limit-to-updateCustomBlockEntityTag.patch