diff --git a/patches/server/0444-Brand-support.patch b/patches/server/0444-Brand-support.patch deleted file mode 100644 index 1eac141c5fa57..0000000000000 --- a/patches/server/0444-Brand-support.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: DigitalRegent -Date: Sat, 11 Apr 2020 13:10:58 +0200 -Subject: [PATCH] Brand support - - -diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 4f98f80f6d8bebba33bad37fe6a722f778f93ed8..48985c0577fe1a09838137286e32128b29a60552 100644 ---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java -+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -271,6 +271,7 @@ public class ServerPlayer extends Player { - public boolean isRealPlayer; // Paper - public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet cachedSingleHashSet; // Paper - public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper -+ public @Nullable String clientBrandName = null; // Paper - Brand name - - // Paper start - replace player chunk loader - private final java.util.concurrent.atomic.AtomicReference viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1)); -diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index d1808bf9dc19fad84da5eb3b4c3d549bc624b00a..e8133a1ec975b7f63926acc7d6ab9291a2107084 100644 ---- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -+++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -@@ -54,6 +54,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack - private int latency; - private volatile boolean suspendFlushingOnServerThread = false; - private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit -+ protected static final ResourceLocation MINECRAFT_BRAND = new ResourceLocation("brand"); // Paper - Brand support - - public ServerCommonPacketListenerImpl(MinecraftServer minecraftserver, Connection networkmanager, CommonListenerCookie commonlistenercookie, ServerPlayer player) { // CraftBukkit - this.server = minecraftserver; -@@ -109,6 +110,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack - - @Override - public void handleCustomPayload(ServerboundCustomPayloadPacket packet) { -+ // Paper start - handle brand payload packet -+ if (packet.payload() instanceof net.minecraft.network.protocol.common.custom.BrandPayload brandPayload) { -+ this.player.clientBrandName = brandPayload.brand(); -+ } -+ // Paper end - handle brand payload - if (!(packet.payload() instanceof ServerboundCustomPayloadPacket.UnknownPayload)) { - return; - } -@@ -140,6 +146,15 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack - try { - byte[] data = new byte[payload.readableBytes()]; - payload.readBytes(data); -+ // Paper start - Brand support - Retain this incase upstream decides to 'break' the new mechanism in favour of backwards compat... -+ if (identifier.equals(MINECRAFT_BRAND)) { -+ try { -+ this.player.clientBrandName = new net.minecraft.network.FriendlyByteBuf(io.netty.buffer.Unpooled.copiedBuffer(data)).readUtf(256); -+ } catch (StringIndexOutOfBoundsException ex) { -+ this.player.clientBrandName = "illegal"; -+ } -+ } -+ // Paper end - this.cserver.getMessenger().dispatchIncomingMessage(this.player.getBukkitEntity(), identifier.toString(), data); - } catch (Exception ex) { - ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex); -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a516aa3ff7949d933c15220160f83a5b5dd5fd6c..82c3cac22e7384966bcd4d55a3434b781b5a6795 100644 ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3009,6 +3009,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - // Paper end - }; - -+ // Paper start - brand support -+ @Override -+ public String getClientBrandName() { -+ return getHandle().clientBrandName; -+ } -+ // Paper end -+ - public Player.Spigot spigot() - { - return this.spigot; diff --git a/patches/server/0444-Rewrite-custom-payload-handler.patch b/patches/server/0444-Rewrite-custom-payload-handler.patch new file mode 100644 index 0000000000000..e756f710fd9d7 --- /dev/null +++ b/patches/server/0444-Rewrite-custom-payload-handler.patch @@ -0,0 +1,180 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: LemonCaramel +Date: Mon, 23 Oct 2023 15:03:59 +0900 +Subject: [PATCH] Rewrite custom payload handler + + +diff --git a/src/main/java/io/papermc/paper/network/payload/ChannelPayload.java b/src/main/java/io/papermc/paper/network/payload/ChannelPayload.java +new file mode 100644 +index 0000000000000000000000000000000000000000..c7a8636de412d880d89fae43bb2ecaa61915eed2 +--- /dev/null ++++ b/src/main/java/io/papermc/paper/network/payload/ChannelPayload.java +@@ -0,0 +1,59 @@ ++package io.papermc.paper.network.payload; ++ ++import net.minecraft.network.FriendlyByteBuf; ++import net.minecraft.network.protocol.common.custom.CustomPacketPayload; ++import net.minecraft.resources.ResourceLocation; ++import org.jetbrains.annotations.NotNull; ++import java.nio.charset.StandardCharsets; ++ ++public sealed abstract class ChannelPayload implements CustomPacketPayload permits ChannelPayload.Register, ChannelPayload.Unregister { ++ ++ public static final ResourceLocation REGISTER = new ResourceLocation("register"); ++ public static final ResourceLocation UNREGISTER = new ResourceLocation("unregister"); ++ ++ private final String channels; ++ ++ private ChannelPayload(final FriendlyByteBuf buf) { ++ this.channels = buf.toString(StandardCharsets.UTF_8); ++ buf.readerIndex(buf.readerIndex() + channels.length()); ++ } ++ ++ @Override ++ public final void write(final FriendlyByteBuf buf) { ++ buf.writeBytes(channels.getBytes(StandardCharsets.UTF_8)); ++ } ++ ++ public final String[] channels() { ++ return channels.split("\0"); ++ } ++ ++ /** ++ * Channel register payload. (minecraft:register) ++ */ ++ public static final class Register extends ChannelPayload { ++ ++ public Register(final FriendlyByteBuf buf) { ++ super(buf); ++ } ++ ++ @Override ++ public @NotNull ResourceLocation id() { ++ return REGISTER; ++ } ++ } ++ ++ /** ++ * Channel unregister payload. (minecraft:unregister) ++ */ ++ public static final class Unregister extends ChannelPayload { ++ ++ public Unregister(final FriendlyByteBuf buf) { ++ super(buf); ++ } ++ ++ @Override ++ public @NotNull ResourceLocation id() { ++ return UNREGISTER; ++ } ++ } ++} +diff --git a/src/main/java/io/papermc/paper/network/payload/ReadableMessage.java b/src/main/java/io/papermc/paper/network/payload/ReadableMessage.java +new file mode 100644 +index 0000000000000000000000000000000000000000..df2d63ab6c557755ed740c1b57e1a71af9db4ba2 +--- /dev/null ++++ b/src/main/java/io/papermc/paper/network/payload/ReadableMessage.java +@@ -0,0 +1,8 @@ ++package io.papermc.paper.network.payload; ++ ++import net.minecraft.network.protocol.common.custom.CustomPacketPayload; ++ ++public interface ReadableMessage extends CustomPacketPayload { ++ ++ byte[] message(); ++} +diff --git a/src/main/java/net/minecraft/network/protocol/common/ServerboundCustomPayloadPacket.java b/src/main/java/net/minecraft/network/protocol/common/ServerboundCustomPayloadPacket.java +index af86f752c33a2990405fea058b7c41c437ba9d46..8f5ab7d6cceb3558960eeea1b90a75d227ba367a 100644 +--- a/src/main/java/net/minecraft/network/protocol/common/ServerboundCustomPayloadPacket.java ++++ b/src/main/java/net/minecraft/network/protocol/common/ServerboundCustomPayloadPacket.java +@@ -12,7 +12,13 @@ import net.minecraft.resources.ResourceLocation; + public record ServerboundCustomPayloadPacket(CustomPacketPayload payload) implements Packet { + + private static final int MAX_PAYLOAD_SIZE = 32767; +- private static final Map> KNOWN_TYPES = ImmutableMap.>builder().build(); // CraftBukkit - no special handling ++ // Paper start - Rewrite custom payload handler ++ private static final Map> KNOWN_TYPES = ++ ImmutableMap.>builder() ++ .put(io.papermc.paper.network.payload.ChannelPayload.REGISTER, io.papermc.paper.network.payload.ChannelPayload.Register::new) ++ .put(io.papermc.paper.network.payload.ChannelPayload.UNREGISTER, io.papermc.paper.network.payload.ChannelPayload.Unregister::new) ++ .build(); ++ // Paper end - Rewrite custom payload handler + + public ServerboundCustomPayloadPacket(FriendlyByteBuf buf) { + this(readPayload(buf.readResourceLocation(), buf)); +@@ -47,7 +53,15 @@ public record ServerboundCustomPayloadPacket(CustomPacketPayload payload) implem + } + + // CraftBukkit start +- public record UnknownPayload(ResourceLocation id, io.netty.buffer.ByteBuf data) implements CustomPacketPayload { ++ // Paper start - Rewrite custom payload handler ++ public record UnknownPayload(ResourceLocation id, io.netty.buffer.ByteBuf data) implements io.papermc.paper.network.payload.ReadableMessage { ++ @Override ++ public byte[] message() { ++ final byte[] message = new byte[data.readableBytes()]; ++ data.readBytes(message); ++ return message; ++ } ++ // Paper end - Rewrite custom payload handler + + @Override + public void write(FriendlyByteBuf buf) { +diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +index d25b6431ce617d90fd1d6489a308d6630b92c175..568a1252acb00a8547e95cf529fdf3be7f3ca839 100644 +--- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java ++++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +@@ -104,6 +104,45 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack + public void handlePong(ServerboundPongPacket packet) {} + + // CraftBukkit start ++ // Paper start - Rewrite custom payload handler ++ @Override ++ public void handleCustomPayload(ServerboundCustomPayloadPacket packet) { ++ PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); ++ if (packet.payload() instanceof io.papermc.paper.network.payload.ChannelPayload.Register payload) { ++ try { ++ final CraftPlayer player = this.getCraftPlayer(); ++ for (final String channel : payload.channels()) { ++ player.addChannel(channel); ++ } ++ } catch (final Exception exception) { ++ ServerGamePacketListenerImpl.LOGGER.error("Couldn't register custom payload", exception); ++ this.disconnect("Invalid payload REGISTER!"); ++ } ++ return; ++ } else if (packet.payload() instanceof io.papermc.paper.network.payload.ChannelPayload.Unregister payload) { ++ try { ++ final CraftPlayer player = this.getCraftPlayer(); ++ for (final String channel : payload.channels()) { ++ player.removeChannel(channel); ++ } ++ } catch (final Exception exception) { ++ ServerGamePacketListenerImpl.LOGGER.error("Couldn't unregister custom payload", exception); ++ this.disconnect("Invalid payload UNREGISTER!"); ++ } ++ return; ++ } ++ ++ // Dispatch Message ++ if (packet.payload() instanceof io.papermc.paper.network.payload.ReadableMessage payload) { ++ try { ++ this.cserver.getMessenger().dispatchIncomingMessage(this.player.getBukkitEntity(), payload.id().toString(), payload.message()); ++ } catch (final Exception exception) { ++ ServerGamePacketListenerImpl.LOGGER.error("Couldn't dispatch custom payload", exception); ++ this.disconnect("Invalid custom payload!"); ++ } ++ } ++ } ++ /* + private static final ResourceLocation CUSTOM_REGISTER = new ResourceLocation("register"); + private static final ResourceLocation CUSTOM_UNREGISTER = new ResourceLocation("unregister"); + +@@ -148,6 +187,8 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack + } + + } ++ */ ++ // Paper end - Rewrite custom payload handler + + public final boolean isDisconnected() { + return (!this.player.joining && !this.connection.isConnected()) || this.processedDisconnect; // Paper diff --git a/patches/server/0445-Brand-support.patch b/patches/server/0445-Brand-support.patch new file mode 100644 index 0000000000000..a2b92f673cdf4 --- /dev/null +++ b/patches/server/0445-Brand-support.patch @@ -0,0 +1,100 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: DigitalRegent +Date: Sat, 11 Apr 2020 13:10:58 +0200 +Subject: [PATCH] Brand support + + +diff --git a/src/main/java/io/papermc/paper/network/payload/BrandPayload.java b/src/main/java/io/papermc/paper/network/payload/BrandPayload.java +new file mode 100644 +index 0000000000000000000000000000000000000000..da940967dd1f84093506f9d845d8ee8aaa53c693 +--- /dev/null ++++ b/src/main/java/io/papermc/paper/network/payload/BrandPayload.java +@@ -0,0 +1,30 @@ ++package io.papermc.paper.network.payload; ++ ++import net.minecraft.network.FriendlyByteBuf; ++import net.minecraft.resources.ResourceLocation; ++import org.jetbrains.annotations.NotNull; ++import java.nio.charset.StandardCharsets; ++ ++public record BrandPayload(@NotNull String raw, @NotNull String brand) implements ReadableMessage { ++ ++ public static final ResourceLocation ID = new ResourceLocation("brand"); ++ ++ public BrandPayload(final FriendlyByteBuf buf) { ++ this(buf.toString(StandardCharsets.UTF_8), buf.readUtf()); ++ } ++ ++ @Override ++ public byte[] message() { ++ return raw.getBytes(StandardCharsets.UTF_8); ++ } ++ ++ @Override ++ public void write(final FriendlyByteBuf buf) { ++ buf.writeUtf(this.brand); ++ } ++ ++ @Override ++ public @NotNull ResourceLocation id() { ++ return ID; ++ } ++} +diff --git a/src/main/java/net/minecraft/network/protocol/common/ServerboundCustomPayloadPacket.java b/src/main/java/net/minecraft/network/protocol/common/ServerboundCustomPayloadPacket.java +index 8f5ab7d6cceb3558960eeea1b90a75d227ba367a..c4a5eca07ad0622d6e8d503ba53d9e012365005f 100644 +--- a/src/main/java/net/minecraft/network/protocol/common/ServerboundCustomPayloadPacket.java ++++ b/src/main/java/net/minecraft/network/protocol/common/ServerboundCustomPayloadPacket.java +@@ -17,6 +17,7 @@ public record ServerboundCustomPayloadPacket(CustomPacketPayload payload) implem + ImmutableMap.>builder() + .put(io.papermc.paper.network.payload.ChannelPayload.REGISTER, io.papermc.paper.network.payload.ChannelPayload.Register::new) + .put(io.papermc.paper.network.payload.ChannelPayload.UNREGISTER, io.papermc.paper.network.payload.ChannelPayload.Unregister::new) ++ .put(io.papermc.paper.network.payload.BrandPayload.ID, io.papermc.paper.network.payload.BrandPayload::new) // Paper - brand support + .build(); + // Paper end - Rewrite custom payload handler + +diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java +index 2c2b1aef3f510edb9bb124581739f06692ab5673..567bfcdf5c946d09bb8188435ee13930082dccf5 100644 +--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java ++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java +@@ -271,6 +271,7 @@ public class ServerPlayer extends Player { + public boolean isRealPlayer; // Paper + public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet cachedSingleHashSet; // Paper + public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper ++ public @Nullable String clientBrandName = null; // Paper - Brand name + + // Paper start - replace player chunk loader + private final java.util.concurrent.atomic.AtomicReference viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1)); +diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +index 568a1252acb00a8547e95cf529fdf3be7f3ca839..efc5543670af2b8bb83b862d4d7e70bbad5cda8c 100644 +--- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java ++++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +@@ -131,6 +131,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack + } + return; + } ++ // Paper start - handle brand payload packet ++ else if (packet.payload() instanceof io.papermc.paper.network.payload.BrandPayload brandPayload) { ++ this.player.clientBrandName = brandPayload.brand(); ++ } ++ // Paper end - handle brand payload + + // Dispatch Message + if (packet.payload() instanceof io.papermc.paper.network.payload.ReadableMessage payload) { +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +index b92cc9f8d62cc3bfefe42c4c1fb08af4731dd48f..7b1404ac481ea9a059197b9f752327ef0bf72c5c 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +@@ -3009,6 +3009,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + // Paper end + }; + ++ // Paper start - brand support ++ @Override ++ public String getClientBrandName() { ++ return getHandle().clientBrandName; ++ } ++ // Paper end ++ + public Player.Spigot spigot() + { + return this.spigot; diff --git a/patches/server/0445-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0446-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0445-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0446-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0446-Don-t-require-FACING-data.patch b/patches/server/0447-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0446-Don-t-require-FACING-data.patch rename to patches/server/0447-Don-t-require-FACING-data.patch diff --git a/patches/server/0447-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0448-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0447-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0448-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0448-Add-moon-phase-API.patch b/patches/server/0449-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0448-Add-moon-phase-API.patch rename to patches/server/0449-Add-moon-phase-API.patch diff --git a/patches/server/0449-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0450-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0449-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0450-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0450-Prevent-headless-pistons-from-being-created.patch b/patches/server/0451-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0450-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0451-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0451-Add-BellRingEvent.patch b/patches/server/0452-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0451-Add-BellRingEvent.patch rename to patches/server/0452-Add-BellRingEvent.patch diff --git a/patches/server/0452-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0453-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0452-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0453-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0453-Buffer-joins-to-world.patch b/patches/server/0454-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0453-Buffer-joins-to-world.patch rename to patches/server/0454-Buffer-joins-to-world.patch diff --git a/patches/server/0454-Eigencraft-redstone-implementation.patch b/patches/server/0455-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/0454-Eigencraft-redstone-implementation.patch rename to patches/server/0455-Eigencraft-redstone-implementation.patch diff --git a/patches/server/0455-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0456-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0455-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0456-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0456-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0457-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0456-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0457-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0457-Add-more-Evoker-API.patch b/patches/server/0458-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0457-Add-more-Evoker-API.patch rename to patches/server/0458-Add-more-Evoker-API.patch diff --git a/patches/server/0458-Add-methods-to-get-translation-keys.patch b/patches/server/0459-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0458-Add-methods-to-get-translation-keys.patch rename to patches/server/0459-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0459-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0460-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0459-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0460-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0460-Cache-block-data-strings.patch b/patches/server/0461-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0460-Cache-block-data-strings.patch rename to patches/server/0461-Cache-block-data-strings.patch diff --git a/patches/server/0461-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0462-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 100% rename from patches/server/0461-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0462-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch diff --git a/patches/server/0462-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0463-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0462-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0463-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0463-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0464-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0463-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0464-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0464-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0465-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/server/0464-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0465-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/server/0465-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0466-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/server/0465-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0466-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/server/0466-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0467-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0466-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0467-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0467-Entity-isTicking.patch b/patches/server/0468-Entity-isTicking.patch similarity index 100% rename from patches/server/0467-Entity-isTicking.patch rename to patches/server/0468-Entity-isTicking.patch diff --git a/patches/server/0468-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0469-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0468-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0469-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0469-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0470-Fix-Concurrency-issue-in-ShufflingList.patch similarity index 100% rename from patches/server/0469-Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/server/0470-Fix-Concurrency-issue-in-ShufflingList.patch diff --git a/patches/server/0470-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0471-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0470-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0471-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0471-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0472-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/server/0471-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0472-Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/server/0472-Optimise-getType-calls.patch b/patches/server/0473-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0472-Optimise-getType-calls.patch rename to patches/server/0473-Optimise-getType-calls.patch diff --git a/patches/server/0473-Villager-resetOffers.patch b/patches/server/0474-Villager-resetOffers.patch similarity index 100% rename from patches/server/0473-Villager-resetOffers.patch rename to patches/server/0474-Villager-resetOffers.patch diff --git a/patches/server/0474-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0475-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/0474-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0475-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/0475-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0476-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0475-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/server/0476-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0476-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0477-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0476-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0477-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0477-Player-elytra-boost-API.patch b/patches/server/0478-Player-elytra-boost-API.patch similarity index 94% rename from patches/server/0477-Player-elytra-boost-API.patch rename to patches/server/0478-Player-elytra-boost-API.patch index 15b812e40129f..192b0e99e201a 100644 --- a/patches/server/0477-Player-elytra-boost-API.patch +++ b/patches/server/0478-Player-elytra-boost-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 28c80b15f83947cf44f71da9f9d971f2d6e5dd5b..a0ee2811d691f0088d94a308705dab5529d52810 100644 +index 0656ea43e1d508d8f6af308475942c28d77655a4..aef0fa6fd575c08c75c75463abcc43089aada9e3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -626,6 +626,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0478-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0479-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0478-Fixed-TileEntityBell-memory-leak.patch rename to patches/server/0479-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0479-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0480-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0479-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0480-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0480-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0481-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0480-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0481-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0481-Add-ignore-discounts-API.patch b/patches/server/0482-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0481-Add-ignore-discounts-API.patch rename to patches/server/0482-Add-ignore-discounts-API.patch diff --git a/patches/server/0482-Toggle-for-removing-existing-dragon.patch b/patches/server/0483-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0482-Toggle-for-removing-existing-dragon.patch rename to patches/server/0483-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0483-Fix-client-lag-on-advancement-loading.patch b/patches/server/0484-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0483-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0484-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0484-Item-no-age-no-player-pickup.patch b/patches/server/0485-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0484-Item-no-age-no-player-pickup.patch rename to patches/server/0485-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0485-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0486-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/0485-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/0486-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/0486-Beacon-API-custom-effect-ranges.patch b/patches/server/0487-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0486-Beacon-API-custom-effect-ranges.patch rename to patches/server/0487-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0487-Add-API-for-quit-reason.patch b/patches/server/0488-Add-API-for-quit-reason.patch similarity index 93% rename from patches/server/0487-Add-API-for-quit-reason.patch rename to patches/server/0488-Add-API-for-quit-reason.patch index f68da0a427102..8a5f710249b6c 100644 --- a/patches/server/0487-Add-API-for-quit-reason.patch +++ b/patches/server/0488-Add-API-for-quit-reason.patch @@ -25,7 +25,7 @@ index f9d7fec242a059a3b056c569ffaf214a361716d6..33a3c657bd390b9e8bc23af93c1107f5 Connection.LOGGER.debug("Failed to sent packet", throwable); if (this.getSending() == PacketFlow.CLIENTBOUND) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 54d0b44eba475f17a908e09d9b56a94a7f050672..bd944ce3308a931391777e3a468daee06d493c73 100644 +index 567bfcdf5c946d09bb8188435ee13930082dccf5..bf637aae0dcd701dd31568b3c84851349c4c5a0a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -272,6 +272,7 @@ public class ServerPlayer extends Player { @@ -37,10 +37,10 @@ index 54d0b44eba475f17a908e09d9b56a94a7f050672..bd944ce3308a931391777e3a468daee0 // Paper start - replace player chunk loader private final java.util.concurrent.atomic.AtomicReference viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1)); diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index e8133a1ec975b7f63926acc7d6ab9291a2107084..95d37df1b51453722d47eb07e2e0247f308fa171 100644 +index efc5543670af2b8bb83b862d4d7e70bbad5cda8c..5d17a500a38a200730ffd170c267e3edc9937ad9 100644 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -@@ -302,6 +302,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -333,6 +333,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack final Component ichatbasecomponent = io.papermc.paper.adventure.PaperAdventure.asVanilla(event.reason()); // Paper - Adventure // CraftBukkit end @@ -49,7 +49,7 @@ index e8133a1ec975b7f63926acc7d6ab9291a2107084..95d37df1b51453722d47eb07e2e0247f this.connection.disconnect(ichatbasecomponent); })); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 1c95c4ff3f4b1811ff60ecb9518e0ef90c5120a5..f5df936cd96688758a1acd8d3ff743e507bc2001 100644 +index cedc6b1e4255336b610ab9ba88a04d8dfde433cf..2c3ff91a7275158cdffa828e133a131b138bfa7c 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -560,7 +560,7 @@ public abstract class PlayerList { diff --git a/patches/server/0488-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0489-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0488-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0489-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0489-Expose-world-spawn-angle.patch b/patches/server/0490-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0489-Expose-world-spawn-angle.patch rename to patches/server/0490-Expose-world-spawn-angle.patch diff --git a/patches/server/0490-Add-Destroy-Speed-API.patch b/patches/server/0491-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0490-Add-Destroy-Speed-API.patch rename to patches/server/0491-Add-Destroy-Speed-API.patch diff --git a/patches/server/0491-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0492-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0491-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0492-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0492-Add-LivingEntity-clearActiveItem.patch b/patches/server/0493-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0492-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0493-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0493-Add-PlayerItemCooldownEvent.patch b/patches/server/0494-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0493-Add-PlayerItemCooldownEvent.patch rename to patches/server/0494-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0494-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0495-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0494-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0495-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0495-More-lightning-API.patch b/patches/server/0496-More-lightning-API.patch similarity index 100% rename from patches/server/0495-More-lightning-API.patch rename to patches/server/0496-More-lightning-API.patch diff --git a/patches/server/0496-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0497-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 100% rename from patches/server/0496-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0497-Climbing-should-not-bypass-cramming-gamerule.patch diff --git a/patches/server/0497-Added-missing-default-perms-for-commands.patch b/patches/server/0498-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0497-Added-missing-default-perms-for-commands.patch rename to patches/server/0498-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0498-Add-PlayerShearBlockEvent.patch b/patches/server/0499-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0498-Add-PlayerShearBlockEvent.patch rename to patches/server/0499-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0499-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0500-Fix-curing-zombie-villager-discount-exploit.patch similarity index 100% rename from patches/server/0499-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/server/0500-Fix-curing-zombie-villager-discount-exploit.patch diff --git a/patches/server/0500-Limit-recipe-packets.patch b/patches/server/0501-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0500-Limit-recipe-packets.patch rename to patches/server/0501-Limit-recipe-packets.patch diff --git a/patches/server/0501-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0502-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0501-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0502-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0502-Player-Chunk-Load-Unload-Events.patch b/patches/server/0503-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0502-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0503-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0503-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0504-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0503-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0504-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0504-Expose-LivingEntity-hurt-direction.patch b/patches/server/0505-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0504-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0505-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0505-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0506-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0505-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0506-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0506-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0507-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0506-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0507-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0507-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0508-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0507-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0508-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0508-Implement-TargetHitEvent.patch b/patches/server/0509-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0508-Implement-TargetHitEvent.patch rename to patches/server/0509-Implement-TargetHitEvent.patch diff --git a/patches/server/0509-MC-4-Fix-item-position-desync.patch b/patches/server/0510-MC-4-Fix-item-position-desync.patch similarity index 100% rename from patches/server/0509-MC-4-Fix-item-position-desync.patch rename to patches/server/0510-MC-4-Fix-item-position-desync.patch diff --git a/patches/server/0510-Additional-Block-Material-API-s.patch b/patches/server/0511-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0510-Additional-Block-Material-API-s.patch rename to patches/server/0511-Additional-Block-Material-API-s.patch diff --git a/patches/server/0511-Fix-harming-potion-dupe.patch b/patches/server/0512-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0511-Fix-harming-potion-dupe.patch rename to patches/server/0512-Fix-harming-potion-dupe.patch diff --git a/patches/server/0512-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0513-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0512-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0513-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0513-Cache-burn-durations.patch b/patches/server/0514-Cache-burn-durations.patch similarity index 100% rename from patches/server/0513-Cache-burn-durations.patch rename to patches/server/0514-Cache-burn-durations.patch diff --git a/patches/server/0514-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0515-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0514-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0515-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0515-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0516-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0515-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0516-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0516-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0517-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0516-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0517-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0517-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0518-Fix-interact-event-not-being-called-sometimes.patch similarity index 100% rename from patches/server/0517-Fix-interact-event-not-being-called-sometimes.patch rename to patches/server/0518-Fix-interact-event-not-being-called-sometimes.patch diff --git a/patches/server/0518-Zombie-API-breaking-doors.patch b/patches/server/0519-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0518-Zombie-API-breaking-doors.patch rename to patches/server/0519-Zombie-API-breaking-doors.patch diff --git a/patches/server/0519-Fix-nerfed-slime-when-splitting.patch b/patches/server/0520-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0519-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0520-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0520-Add-EntityLoadCrossbowEvent.patch b/patches/server/0521-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0520-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0521-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0521-Added-WorldGameRuleChangeEvent.patch b/patches/server/0522-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0521-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0522-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0522-Added-ServerResourcesReloadedEvent.patch b/patches/server/0523-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0522-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0523-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0523-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0524-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0523-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0524-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0524-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0525-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0524-Implemented-BlockFailedDispenseEvent.patch rename to patches/server/0525-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0525-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0526-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0525-Added-PlayerLecternPageChangeEvent.patch rename to patches/server/0526-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0526-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0527-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0526-Added-PlayerLoomPatternSelectEvent.patch rename to patches/server/0527-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0527-Configurable-door-breaking-difficulty.patch b/patches/server/0528-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0527-Configurable-door-breaking-difficulty.patch rename to patches/server/0528-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0528-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0529-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0528-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0529-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0529-Remove-stale-POIs.patch b/patches/server/0530-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0529-Remove-stale-POIs.patch rename to patches/server/0530-Remove-stale-POIs.patch diff --git a/patches/server/0530-Fix-villager-boat-exploit.patch b/patches/server/0531-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0530-Fix-villager-boat-exploit.patch rename to patches/server/0531-Fix-villager-boat-exploit.patch diff --git a/patches/server/0531-Add-sendOpLevel-API.patch b/patches/server/0532-Add-sendOpLevel-API.patch similarity index 95% rename from patches/server/0531-Add-sendOpLevel-API.patch rename to patches/server/0532-Add-sendOpLevel-API.patch index aa5163a0bfd43..b6586f72bc1b3 100644 --- a/patches/server/0531-Add-sendOpLevel-API.patch +++ b/patches/server/0532-Add-sendOpLevel-API.patch @@ -32,7 +32,7 @@ index 709c37e41f566a8301ec26ca76eb28c44a9bf1cd..adc96e0c4f81375253b540a3b003a00e public boolean isWhiteListed(GameProfile profile) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 47fdb3c21e10f86c34c1634708dac784577cd5f0..7362f0e73533c6b202021b93057cc0a23b5f3e99 100644 +index ec38acdfdbac99fe3f0b40d37e59d8348fcb9c1f..467ab8fbb335617ef419b35c7881ca5606b3e541 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -640,6 +640,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0532-TODO-Registry-Modification-API.patch b/patches/server/0533-TODO-Registry-Modification-API.patch similarity index 100% rename from patches/server/0532-TODO-Registry-Modification-API.patch rename to patches/server/0533-TODO-Registry-Modification-API.patch diff --git a/patches/server/0533-Add-StructuresLocateEvent.patch b/patches/server/0534-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0533-Add-StructuresLocateEvent.patch rename to patches/server/0534-Add-StructuresLocateEvent.patch diff --git a/patches/server/0534-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0535-Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from patches/server/0534-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0535-Collision-option-for-requiring-a-player-participant.patch diff --git a/patches/server/0535-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0536-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0535-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0536-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0536-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0537-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0536-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0537-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0537-Make-schedule-command-per-world.patch b/patches/server/0538-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0537-Make-schedule-command-per-world.patch rename to patches/server/0538-Make-schedule-command-per-world.patch diff --git a/patches/server/0538-Configurable-max-leash-distance.patch b/patches/server/0539-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0538-Configurable-max-leash-distance.patch rename to patches/server/0539-Configurable-max-leash-distance.patch diff --git a/patches/server/0539-Implement-BlockPreDispenseEvent.patch b/patches/server/0540-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0539-Implement-BlockPreDispenseEvent.patch rename to patches/server/0540-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0540-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0541-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0540-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0541-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0541-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0542-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0541-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0542-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0542-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0543-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0542-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0543-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0543-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0544-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0543-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0544-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0544-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0545-Reset-shield-blocking-on-dimension-change.patch similarity index 89% rename from patches/server/0544-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0545-Reset-shield-blocking-on-dimension-change.patch index cbafb7c5a4857..8f6b89c32fc46 100644 --- a/patches/server/0544-Reset-shield-blocking-on-dimension-change.patch +++ b/patches/server/0545-Reset-shield-blocking-on-dimension-change.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index bd944ce3308a931391777e3a468daee06d493c73..d942b68c01b202dcad1377e98199bab2f79feebf 100644 +index 9c74a7e1dc74873c16a0fc474de459ccec4d372d..1d7fe0e7d382d2f2aa5a38732cc6212d6c7a11e3 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1242,6 +1242,11 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0545-add-DragonEggFormEvent.patch b/patches/server/0546-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0545-add-DragonEggFormEvent.patch rename to patches/server/0546-add-DragonEggFormEvent.patch diff --git a/patches/server/0546-EntityMoveEvent.patch b/patches/server/0547-EntityMoveEvent.patch similarity index 100% rename from patches/server/0546-EntityMoveEvent.patch rename to patches/server/0547-EntityMoveEvent.patch diff --git a/patches/server/0547-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0548-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0547-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0548-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0548-Inline-shift-direction-fields.patch b/patches/server/0549-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0548-Inline-shift-direction-fields.patch rename to patches/server/0549-Inline-shift-direction-fields.patch diff --git a/patches/server/0549-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0550-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0549-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0550-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0550-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0551-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0550-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0551-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0551-living-entity-allow-attribute-registration.patch b/patches/server/0552-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0551-living-entity-allow-attribute-registration.patch rename to patches/server/0552-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0552-fix-dead-slime-setSize-invincibility.patch b/patches/server/0553-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0552-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0553-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0553-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0554-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0553-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0554-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0554-Expose-Tracked-Players.patch b/patches/server/0555-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0554-Expose-Tracked-Players.patch rename to patches/server/0555-Expose-Tracked-Players.patch diff --git a/patches/server/0555-Remove-streams-from-SensorNearest.patch b/patches/server/0556-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0555-Remove-streams-from-SensorNearest.patch rename to patches/server/0556-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0556-Improve-ServerGUI.patch b/patches/server/0557-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0556-Improve-ServerGUI.patch rename to patches/server/0557-Improve-ServerGUI.patch diff --git a/patches/server/0557-fix-converting-txt-to-json-file.patch b/patches/server/0558-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0557-fix-converting-txt-to-json-file.patch rename to patches/server/0558-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0558-Add-worldborder-events.patch b/patches/server/0559-Add-worldborder-events.patch similarity index 100% rename from patches/server/0558-Add-worldborder-events.patch rename to patches/server/0559-Add-worldborder-events.patch diff --git a/patches/server/0559-added-PlayerNameEntityEvent.patch b/patches/server/0560-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0559-added-PlayerNameEntityEvent.patch rename to patches/server/0560-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0560-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0561-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0560-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0561-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0561-Add-recipe-to-cook-events.patch b/patches/server/0562-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0561-Add-recipe-to-cook-events.patch rename to patches/server/0562-Add-recipe-to-cook-events.patch diff --git a/patches/server/0562-Add-Block-isValidTool.patch b/patches/server/0563-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0562-Add-Block-isValidTool.patch rename to patches/server/0563-Add-Block-isValidTool.patch diff --git a/patches/server/0563-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0564-Allow-using-signs-inside-spawn-protection.patch similarity index 94% rename from patches/server/0563-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0564-Allow-using-signs-inside-spawn-protection.patch index 56f3e37f2b395..b5c3a124e50b1 100644 --- a/patches/server/0563-Allow-using-signs-inside-spawn-protection.patch +++ b/patches/server/0564-Allow-using-signs-inside-spawn-protection.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 63535d38c0f7a7fbf19a1e91747f6989d0f72a60..c6f983b66fa1c61f8d0a7d7806937dced4ea72c1 100644 +index 760d49347b94d5d971aaed5be5fef3471e9758e8..5505b15ce0b7891b4d9329a8f4f7b7c12057c9e8 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1725,7 +1725,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0564-Expand-world-key-API.patch b/patches/server/0565-Expand-world-key-API.patch similarity index 100% rename from patches/server/0564-Expand-world-key-API.patch rename to patches/server/0565-Expand-world-key-API.patch diff --git a/patches/server/0565-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0566-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0565-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0566-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0566-Item-Rarity-API.patch b/patches/server/0567-Item-Rarity-API.patch similarity index 100% rename from patches/server/0566-Item-Rarity-API.patch rename to patches/server/0567-Item-Rarity-API.patch diff --git a/patches/server/0567-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0568-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0567-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0568-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0568-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0569-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0568-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0569-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0569-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0570-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0569-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0570-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0570-Expose-protocol-version.patch b/patches/server/0571-Expose-protocol-version.patch similarity index 100% rename from patches/server/0570-Expose-protocol-version.patch rename to patches/server/0571-Expose-protocol-version.patch diff --git a/patches/server/0571-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0572-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0571-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0572-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0572-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0573-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0572-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0573-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0573-Add-bypass-host-check.patch b/patches/server/0574-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0573-Add-bypass-host-check.patch rename to patches/server/0574-Add-bypass-host-check.patch diff --git a/patches/server/0574-Set-area-affect-cloud-rotation.patch b/patches/server/0575-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0574-Set-area-affect-cloud-rotation.patch rename to patches/server/0575-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0575-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0576-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0575-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0576-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0576-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0577-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0576-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0577-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0577-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0578-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0577-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0578-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0578-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0579-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0578-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0579-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0579-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0580-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 93% rename from patches/server/0579-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0580-fix-PlayerItemHeldEvent-firing-twice.patch index 12b81e4815417..8cb742badbdaf 100644 --- a/patches/server/0579-fix-PlayerItemHeldEvent-firing-twice.patch +++ b/patches/server/0580-fix-PlayerItemHeldEvent-firing-twice.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d45c8e234332978154f1fafad6ed5edf927f6103..fe0d6841b6ad76fc4a8cf8181393a9707a98423d 100644 +index 7c3cbd489c9d7aaa678db47ebe8f27a3fc2aabc7..133f9d46e204c3f70c9a3ed0c2fe434f90ac6e8c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1894,6 +1894,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0580-Added-PlayerDeepSleepEvent.patch b/patches/server/0581-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0580-Added-PlayerDeepSleepEvent.patch rename to patches/server/0581-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0581-More-World-API.patch b/patches/server/0582-More-World-API.patch similarity index 100% rename from patches/server/0581-More-World-API.patch rename to patches/server/0582-More-World-API.patch diff --git a/patches/server/0582-Added-PlayerBedFailEnterEvent.patch b/patches/server/0583-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0582-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0583-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0583-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0584-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0583-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0584-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0584-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0585-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0584-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0585-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0585-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0586-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0585-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0586-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0586-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0587-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 97% rename from patches/server/0586-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0587-add-RespawnFlags-to-PlayerRespawnEvent.patch index 773485081d02b..8a6c10c1cb513 100644 --- a/patches/server/0586-add-RespawnFlags-to-PlayerRespawnEvent.patch +++ b/patches/server/0587-add-RespawnFlags-to-PlayerRespawnEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index fe0d6841b6ad76fc4a8cf8181393a9707a98423d..73ea4907e81d7fd7830b3a9a368c88ac903428bb 100644 +index 133f9d46e204c3f70c9a3ed0c2fe434f90ac6e8c..73f47741a6cc290bb672871aabea112b26d0e8c0 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2628,7 +2628,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0587-Add-Channel-initialization-listeners.patch b/patches/server/0588-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0587-Add-Channel-initialization-listeners.patch rename to patches/server/0588-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0588-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0589-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0588-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0589-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0589-Add-more-WanderingTrader-API.patch b/patches/server/0590-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0589-Add-more-WanderingTrader-API.patch rename to patches/server/0590-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0590-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0591-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0590-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0591-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0591-Entity-load-save-limit-per-chunk.patch b/patches/server/0592-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0591-Entity-load-save-limit-per-chunk.patch rename to patches/server/0592-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0592-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0593-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0592-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0593-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0593-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0594-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0593-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0594-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0594-Inventory-close.patch b/patches/server/0595-Inventory-close.patch similarity index 100% rename from patches/server/0594-Inventory-close.patch rename to patches/server/0595-Inventory-close.patch diff --git a/patches/server/0595-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0596-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0595-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0596-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0596-Add-basic-Datapack-API.patch b/patches/server/0597-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0596-Add-basic-Datapack-API.patch rename to patches/server/0597-Add-basic-Datapack-API.patch diff --git a/patches/server/0597-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0598-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0597-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0598-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0598-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0599-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0598-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0599-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0599-ItemStack-repair-check-API.patch b/patches/server/0600-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0599-ItemStack-repair-check-API.patch rename to patches/server/0600-ItemStack-repair-check-API.patch diff --git a/patches/server/0600-More-Enchantment-API.patch b/patches/server/0601-More-Enchantment-API.patch similarity index 100% rename from patches/server/0600-More-Enchantment-API.patch rename to patches/server/0601-More-Enchantment-API.patch diff --git a/patches/server/0601-Move-range-check-for-block-placing-up.patch b/patches/server/0602-Move-range-check-for-block-placing-up.patch similarity index 92% rename from patches/server/0601-Move-range-check-for-block-placing-up.patch rename to patches/server/0602-Move-range-check-for-block-placing-up.patch index 9a7aee265fb12..64a3d3d2b10df 100644 --- a/patches/server/0601-Move-range-check-for-block-placing-up.patch +++ b/patches/server/0602-Move-range-check-for-block-placing-up.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 4ba775edd90e716435c9ff5dc5579d96d49507c1..f8b5122ed55574260391206b99f165fa1515bb02 100644 +index 3ad46fcf6706b41fde42abe4e008c5bc86def07c..37e78cda4a41efa4b82fb3c6293bb12597d6e720 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1711,6 +1711,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0602-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0603-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0602-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0603-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/0603-Add-Mob-lookAt-API.patch b/patches/server/0604-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0603-Add-Mob-lookAt-API.patch rename to patches/server/0604-Add-Mob-lookAt-API.patch diff --git a/patches/server/0604-Add-Unix-domain-socket-support.patch b/patches/server/0605-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0604-Add-Unix-domain-socket-support.patch rename to patches/server/0605-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0605-Add-EntityInsideBlockEvent.patch b/patches/server/0606-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0605-Add-EntityInsideBlockEvent.patch rename to patches/server/0606-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0606-Attributes-API-for-item-defaults.patch b/patches/server/0607-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0606-Attributes-API-for-item-defaults.patch rename to patches/server/0607-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0607-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0608-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0607-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0608-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0608-More-Lidded-Block-API.patch b/patches/server/0609-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0608-More-Lidded-Block-API.patch rename to patches/server/0609-More-Lidded-Block-API.patch diff --git a/patches/server/0609-Limit-item-frame-cursors-on-maps.patch b/patches/server/0610-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0609-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0610-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0610-Add-PlayerKickEvent-causes.patch b/patches/server/0611-Add-PlayerKickEvent-causes.patch similarity index 96% rename from patches/server/0610-Add-PlayerKickEvent-causes.patch rename to patches/server/0611-Add-PlayerKickEvent-causes.patch index d90f5b0d02eac..4ab851ef0088f 100644 --- a/patches/server/0610-Add-PlayerKickEvent-causes.patch +++ b/patches/server/0611-Add-PlayerKickEvent-causes.patch @@ -88,10 +88,10 @@ index c68bac4727f6b2ca95fc8c438303097af14286f2..bb629ec263959c8268de88ca807bddb6 return Component.translatable("commands.kick.success", serverPlayer.getDisplayName(), reason); }, true); diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index d660041805bcd1bb97cf347d8b1cfe5c65469f56..a0328cfbe4184a2c1dc895e96fa3fefbdc52bf09 100644 +index 5d17a500a38a200730ffd170c267e3edc9937ad9..5bdce47cd05c5d12b2b844a820bdc542f7f4b8f4 100644 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -@@ -94,7 +94,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -93,7 +93,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack } else if (!this.isSingleplayerOwner()) { // Paper start - This needs to be handled on the main thread for plugins server.submit(() -> { @@ -100,34 +100,34 @@ index d660041805bcd1bb97cf347d8b1cfe5c65469f56..a0328cfbe4184a2c1dc895e96fa3fefb }); // Paper endg } -@@ -130,7 +130,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -116,7 +116,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack } - } catch (Exception ex) { - ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t register custom payload", ex); + } catch (final Exception exception) { + ServerGamePacketListenerImpl.LOGGER.error("Couldn't register custom payload", exception); - this.disconnect("Invalid payload REGISTER!"); + this.disconnect("Invalid payload REGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause } - } else if (identifier.equals(ServerCommonPacketListenerImpl.CUSTOM_UNREGISTER)) { - try { -@@ -140,7 +140,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack + return; + } else if (packet.payload() instanceof io.papermc.paper.network.payload.ChannelPayload.Unregister payload) { +@@ -127,7 +127,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack } - } catch (Exception ex) { - ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t unregister custom payload", ex); + } catch (final Exception exception) { + ServerGamePacketListenerImpl.LOGGER.error("Couldn't unregister custom payload", exception); - this.disconnect("Invalid payload UNREGISTER!"); + this.disconnect("Invalid payload UNREGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause } - } else { - try { -@@ -158,7 +158,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack - this.cserver.getMessenger().dispatchIncomingMessage(this.player.getBukkitEntity(), identifier.toString(), data); - } catch (Exception ex) { - ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex); + return; + } +@@ -143,7 +143,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack + this.cserver.getMessenger().dispatchIncomingMessage(this.player.getBukkitEntity(), payload.id().toString(), payload.message()); + } catch (final Exception exception) { + ServerGamePacketListenerImpl.LOGGER.error("Couldn't dispatch custom payload", exception); - this.disconnect("Invalid custom payload!"); + this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause } } - -@@ -174,7 +174,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack + } +@@ -205,7 +205,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack PacketUtils.ensureRunningOnSameThread(packet, this, (BlockableEventLoop) this.server); if (packet.getAction() == ServerboundResourcePackPacket.Action.DECLINED && this.server.isResourcePackRequired()) { ServerCommonPacketListenerImpl.LOGGER.info("Disconnecting {} due to resource pack rejection", this.playerProfile().getName()); @@ -136,7 +136,7 @@ index d660041805bcd1bb97cf347d8b1cfe5c65469f56..a0328cfbe4184a2c1dc895e96fa3fefb } // Paper start PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packet.getAction().ordinal()]; -@@ -194,7 +194,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -225,7 +225,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack if (this.keepAlivePending) { if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info @@ -145,7 +145,7 @@ index d660041805bcd1bb97cf347d8b1cfe5c65469f56..a0328cfbe4184a2c1dc895e96fa3fefb } } else { if (elapsedTime >= 15000L) { // 15 seconds -@@ -247,18 +247,28 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -278,18 +278,28 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack } // CraftBukkit start @@ -178,7 +178,7 @@ index d660041805bcd1bb97cf347d8b1cfe5c65469f56..a0328cfbe4184a2c1dc895e96fa3fefb // Paper end // CraftBukkit start - fire PlayerKickEvent if (this.processedDisconnect) { -@@ -268,7 +278,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -299,7 +309,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack Waitable waitable = new Waitable() { @Override protected Object evaluate() { @@ -187,7 +187,7 @@ index d660041805bcd1bb97cf347d8b1cfe5c65469f56..a0328cfbe4184a2c1dc895e96fa3fefb return null; } }; -@@ -287,7 +297,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -318,7 +328,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack net.kyori.adventure.text.Component leaveMessage = net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? this.player.getBukkitEntity().displayName() : net.kyori.adventure.text.Component.text(this.player.getScoreboardName())); // Paper - Adventure diff --git a/patches/server/0611-Add-PufferFishStateChangeEvent.patch b/patches/server/0612-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0611-Add-PufferFishStateChangeEvent.patch rename to patches/server/0612-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0612-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0613-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0612-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0613-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0613-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0614-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0613-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/server/0614-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0614-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0615-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0614-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0615-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0615-Add-BellRevealRaiderEvent.patch b/patches/server/0616-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0615-Add-BellRevealRaiderEvent.patch rename to patches/server/0616-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0616-Fix-invulnerable-end-crystals.patch b/patches/server/0617-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0616-Fix-invulnerable-end-crystals.patch rename to patches/server/0617-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0617-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0618-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0617-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0618-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0618-Fix-dangerous-end-portal-logic.patch b/patches/server/0619-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0618-Fix-dangerous-end-portal-logic.patch rename to patches/server/0619-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0619-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0620-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0619-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0620-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0620-Make-item-validations-configurable.patch b/patches/server/0621-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0620-Make-item-validations-configurable.patch rename to patches/server/0621-Make-item-validations-configurable.patch diff --git a/patches/server/0621-Line-Of-Sight-Changes.patch b/patches/server/0622-Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/0621-Line-Of-Sight-Changes.patch rename to patches/server/0622-Line-Of-Sight-Changes.patch diff --git a/patches/server/0622-add-per-world-spawn-limits.patch b/patches/server/0623-add-per-world-spawn-limits.patch similarity index 91% rename from patches/server/0622-add-per-world-spawn-limits.patch rename to patches/server/0623-add-per-world-spawn-limits.patch index b5ff1a2631b0e..a8352ed49b6b8 100644 --- a/patches/server/0622-add-per-world-spawn-limits.patch +++ b/patches/server/0623-add-per-world-spawn-limits.patch @@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits Taken from #2982. Credit to Chasewhip8 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index a08d724c327b8f3eb819f72713b7fe4be18c1940..286db6e246d48fb391c609f4e8a0222f1b294cfc 100644 +index f74b030ead0aa5227adbc23f789756bd08f99931..0103f937e31b7e7b9af846ec80046654c80669df 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -213,6 +213,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0623-Fix-potions-splash-events.patch b/patches/server/0624-Fix-potions-splash-events.patch similarity index 100% rename from patches/server/0623-Fix-potions-splash-events.patch rename to patches/server/0624-Fix-potions-splash-events.patch diff --git a/patches/server/0624-Add-more-LimitedRegion-API.patch b/patches/server/0625-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0624-Add-more-LimitedRegion-API.patch rename to patches/server/0625-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0625-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0626-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0625-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0626-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0626-Missing-Entity-API.patch b/patches/server/0627-Missing-Entity-API.patch similarity index 100% rename from patches/server/0626-Missing-Entity-API.patch rename to patches/server/0627-Missing-Entity-API.patch diff --git a/patches/server/0627-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0628-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 92% rename from patches/server/0627-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0628-Ensure-disconnect-for-book-edit-is-called-on-main.patch index 3c993b44306ce..bf3b5d35992dc 100644 --- a/patches/server/0627-Ensure-disconnect-for-book-edit-is-called-on-main.patch +++ b/patches/server/0628-Ensure-disconnect-for-book-edit-is-called-on-main.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7057bcb958f2ddf71cf6ec28be02a5aa32266436..594a697118debad209aee875eb2e35b3c9707d32 100644 +index 9cd00fce9dadd65020de9c48524416d6d3c82bc4..e084a66544a91cad162b1c9abb4b8f6b982992d7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1095,7 +1095,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0628-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0629-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0628-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0629-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0629-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0630-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0629-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0630-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0630-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0631-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0630-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0631-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0631-Adds-PlayerArmSwingEvent.patch b/patches/server/0632-Adds-PlayerArmSwingEvent.patch similarity index 93% rename from patches/server/0631-Adds-PlayerArmSwingEvent.patch rename to patches/server/0632-Adds-PlayerArmSwingEvent.patch index bc131a01dd63a..318be80dc41c2 100644 --- a/patches/server/0631-Adds-PlayerArmSwingEvent.patch +++ b/patches/server/0632-Adds-PlayerArmSwingEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Adds PlayerArmSwingEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 594a697118debad209aee875eb2e35b3c9707d32..07670c7223665237b3a537a7905250321ebb7468 100644 +index e084a66544a91cad162b1c9abb4b8f6b982992d7..7f94c6022f5889f47bdce98b3c8c95da53581a24 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2317,7 +2317,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0632-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0633-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 92% rename from patches/server/0632-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0633-Fixes-kick-event-leave-message-not-being-sent.patch index 52d7a40ffab0f..3ae033381ca5c 100644 --- a/patches/server/0632-Fixes-kick-event-leave-message-not-being-sent.patch +++ b/patches/server/0633-Fixes-kick-event-leave-message-not-being-sent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fixes kick event leave message not being sent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index ec135dca185c0c9cdb5a28c75d44f54681448cf8..56743ae068c4fb665534f3b30545b2323820740b 100644 +index aa2185e46bd47748a0a2b092ab2caf134fa4fa69..a3672049abc81fa4d34443cf0303d23e0f86b284 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -266,7 +266,6 @@ public class ServerPlayer extends Player { @@ -17,10 +17,10 @@ index ec135dca185c0c9cdb5a28c75d44f54681448cf8..56743ae068c4fb665534f3b30545b232 public boolean isRealPlayer; // Paper public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet cachedSingleHashSet; // Paper diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index 125a9d1ae394db4b0d5418756d50e32feca83344..20122bf191ebc74c223310aea1f004fdbb163e57 100644 +index 5bdce47cd05c5d12b2b844a820bdc542f7f4b8f4..0ffff64d0878ac3c22a146c6cc5851bc87c033ec 100644 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -@@ -76,6 +76,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -75,6 +75,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack @Override public void onDisconnect(Component reason) { @@ -32,7 +32,7 @@ index 125a9d1ae394db4b0d5418756d50e32feca83344..20122bf191ebc74c223310aea1f004fd if (this.isSingleplayerOwner()) { ServerCommonPacketListenerImpl.LOGGER.info("Stopping singleplayer server as player logged out"); this.server.halt(false); -@@ -307,7 +312,6 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -338,7 +343,6 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack // Do not kick the player return; } @@ -40,7 +40,7 @@ index 125a9d1ae394db4b0d5418756d50e32feca83344..20122bf191ebc74c223310aea1f004fd // Send the possibly modified leave message final Component ichatbasecomponent = io.papermc.paper.adventure.PaperAdventure.asVanilla(event.reason()); // Paper - Adventure // CraftBukkit end -@@ -316,7 +320,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -347,7 +351,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack this.connection.send(new ClientboundDisconnectPacket(ichatbasecomponent), PacketSendListener.thenRun(() -> { this.connection.disconnect(ichatbasecomponent); })); @@ -50,7 +50,7 @@ index 125a9d1ae394db4b0d5418756d50e32feca83344..20122bf191ebc74c223310aea1f004fd MinecraftServer minecraftserver = this.server; Connection networkmanager = this.connection; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 07670c7223665237b3a537a7905250321ebb7468..4e9e08c3f59de9eac87f244939dc0a19b85b9802 100644 +index c38d6ff1c4b22833ce8c99ec420741659becf4d2..eabdaf85e904224f936154d415d183ba65e4dbbf 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1855,6 +1855,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -96,7 +96,7 @@ index 07670c7223665237b3a537a7905250321ebb7468..4e9e08c3f59de9eac87f244939dc0a19 this.server.getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(quitMessage), false); // Paper end diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 9a1f1548b7f095946edb105ddfd64932bf64a2df..14f3873d4bf43d5576a4c93b80d8a97841b23355 100644 +index 0139313fb1b06da9df19317748862700c1b5b6e9..e9b012889987d3c0fca2c90a4edee36b2c86cb88 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -551,6 +551,11 @@ public abstract class PlayerList { diff --git a/patches/server/0633-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0634-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0633-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0634-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0634-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0635-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0634-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0635-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0635-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0636-Don-t-apply-cramming-damage-to-players.patch similarity index 94% rename from patches/server/0635-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0636-Don-t-apply-cramming-damage-to-players.patch index b1101975e78a3..2548874b361ac 100644 --- a/patches/server/0635-Don-t-apply-cramming-damage-to-players.patch +++ b/patches/server/0636-Don-t-apply-cramming-damage-to-players.patch @@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed, For those who really want it a config option is provided. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 56743ae068c4fb665534f3b30545b2323820740b..25f6b4e7ac794431f1b6170e9e680e43c44d10cf 100644 +index d20fbe3c03e794bee0c29e251aba223953cfed15..47e7bc46d349e0f0000676948a5c251f555abeb1 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -95,6 +95,7 @@ import net.minecraft.util.Mth; diff --git a/patches/server/0636-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0637-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0636-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0637-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0637-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0638-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0637-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0638-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0638-Stinger-API.patch b/patches/server/0639-Stinger-API.patch similarity index 100% rename from patches/server/0638-Stinger-API.patch rename to patches/server/0639-Stinger-API.patch diff --git a/patches/server/0639-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0640-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0639-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0640-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0640-Add-System.out-err-catcher.patch b/patches/server/0641-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0640-Add-System.out-err-catcher.patch rename to patches/server/0641-Add-System.out-err-catcher.patch diff --git a/patches/server/0641-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0642-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0641-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0642-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0642-Improve-boat-collision-performance.patch b/patches/server/0643-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0642-Improve-boat-collision-performance.patch rename to patches/server/0643-Improve-boat-collision-performance.patch diff --git a/patches/server/0643-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0644-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 93% rename from patches/server/0643-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0644-Prevent-AFK-kick-while-watching-end-credits.patch index 403f8edd6d011..4f88cce17ea63 100644 --- a/patches/server/0643-Prevent-AFK-kick-while-watching-end-credits.patch +++ b/patches/server/0644-Prevent-AFK-kick-while-watching-end-credits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 4e9e08c3f59de9eac87f244939dc0a19b85b9802..ca60102128cd798572a39b3c2eb6c86eba465e90 100644 +index a6886bc4dd06675b6fc3b28d4611842b0fa4e411..2f3fddf5427248c3283173afaed220f7a3fd9e31 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -388,7 +388,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0644-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0645-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0644-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0645-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0645-Add-PlayerSetSpawnEvent.patch b/patches/server/0646-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0645-Add-PlayerSetSpawnEvent.patch rename to patches/server/0646-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0646-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0647-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0646-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0647-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0647-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0648-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0647-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0648-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0648-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0649-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0648-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0649-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0649-Added-EntityDamageItemEvent.patch b/patches/server/0650-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0649-Added-EntityDamageItemEvent.patch rename to patches/server/0650-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0650-Optimize-indirect-passenger-iteration.patch b/patches/server/0651-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0650-Optimize-indirect-passenger-iteration.patch rename to patches/server/0651-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0651-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0652-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0651-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0652-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0652-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0653-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0652-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0653-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0653-Clear-bucket-NBT-after-dispense.patch b/patches/server/0654-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0653-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0654-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0654-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0655-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0654-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0655-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0655-Add-BlockBreakBlockEvent.patch b/patches/server/0656-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0655-Add-BlockBreakBlockEvent.patch rename to patches/server/0656-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0656-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0657-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0656-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0657-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0657-More-CommandBlock-API.patch b/patches/server/0658-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0657-More-CommandBlock-API.patch rename to patches/server/0658-More-CommandBlock-API.patch diff --git a/patches/server/0658-Add-missing-team-sidebar-display-slots.patch b/patches/server/0659-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0658-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0659-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0659-Add-back-EntityPortalExitEvent.patch b/patches/server/0660-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0659-Add-back-EntityPortalExitEvent.patch rename to patches/server/0660-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0660-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0661-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0660-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0661-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0661-Get-entity-default-attributes.patch b/patches/server/0662-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0661-Get-entity-default-attributes.patch rename to patches/server/0662-Get-entity-default-attributes.patch diff --git a/patches/server/0662-Left-handed-API.patch b/patches/server/0663-Left-handed-API.patch similarity index 100% rename from patches/server/0662-Left-handed-API.patch rename to patches/server/0663-Left-handed-API.patch diff --git a/patches/server/0663-Add-more-advancement-API.patch b/patches/server/0664-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0663-Add-more-advancement-API.patch rename to patches/server/0664-Add-more-advancement-API.patch diff --git a/patches/server/0664-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0665-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0664-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/server/0665-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0665-Add-critical-damage-API.patch b/patches/server/0666-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0665-Add-critical-damage-API.patch rename to patches/server/0666-Add-critical-damage-API.patch diff --git a/patches/server/0666-Fix-issues-with-mob-conversion.patch b/patches/server/0667-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0666-Fix-issues-with-mob-conversion.patch rename to patches/server/0667-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0667-Add-isCollidable-methods-to-various-places.patch b/patches/server/0668-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0667-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0668-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0668-Goat-ram-API.patch b/patches/server/0669-Goat-ram-API.patch similarity index 100% rename from patches/server/0668-Goat-ram-API.patch rename to patches/server/0669-Goat-ram-API.patch diff --git a/patches/server/0669-Add-API-for-resetting-a-single-score.patch b/patches/server/0670-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0669-Add-API-for-resetting-a-single-score.patch rename to patches/server/0670-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0670-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0671-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0670-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0671-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0671-Vanilla-command-permission-fixes.patch b/patches/server/0672-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0671-Vanilla-command-permission-fixes.patch rename to patches/server/0672-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0672-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0673-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 97% rename from patches/server/0672-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0673-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch index 26a229716419c..ee020e825e345 100644 --- a/patches/server/0672-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch +++ b/patches/server/0673-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch @@ -28,7 +28,7 @@ index a11bd2d9f5b2fb248cc322ea61886050fa2e73a9..80f2a1204bee79daf0cae9310ce8d552 } // Spigot End diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index f612363c1530dd66fd57eaa324e285d481fa30e6..3fdf2908d0f6ac994fa05e285d7bc365890964ac 100644 +index 6b92189b6dddee7e632c142430eaa784d22adbca..c6d56a225cdaffc0b08eb4805e6bdcb0223fbd91 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1617,6 +1617,18 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0673-Fix-GameProfileCache-concurrency.patch b/patches/server/0674-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0673-Fix-GameProfileCache-concurrency.patch rename to patches/server/0674-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0674-Improve-and-expand-AsyncCatcher.patch b/patches/server/0675-Improve-and-expand-AsyncCatcher.patch similarity index 100% rename from patches/server/0674-Improve-and-expand-AsyncCatcher.patch rename to patches/server/0675-Improve-and-expand-AsyncCatcher.patch diff --git a/patches/server/0675-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0676-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0675-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0676-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0676-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0677-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0676-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0677-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0677-Optimise-general-POI-access.patch b/patches/server/0678-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0677-Optimise-general-POI-access.patch rename to patches/server/0678-Optimise-general-POI-access.patch diff --git a/patches/server/0678-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0679-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0678-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0679-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0679-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0680-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0679-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0680-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0680-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0681-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0680-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0681-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0682-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0682-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0682-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0683-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0682-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0683-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0683-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0684-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0683-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/server/0684-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0684-Time-scoreboard-search.patch b/patches/server/0685-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0684-Time-scoreboard-search.patch rename to patches/server/0685-Time-scoreboard-search.patch diff --git a/patches/server/0685-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0686-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0685-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/0686-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0686-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0687-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0686-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/server/0687-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0687-Execute-chunk-tasks-mid-tick.patch b/patches/server/0688-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0687-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0688-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0688-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0689-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0688-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0689-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0689-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0690-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0689-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0690-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0690-Optimise-random-block-ticking.patch b/patches/server/0691-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/0690-Optimise-random-block-ticking.patch rename to patches/server/0691-Optimise-random-block-ticking.patch diff --git a/patches/server/0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0692-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0692-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0692-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0693-Use-Velocity-compression-and-cipher-natives.patch similarity index 99% rename from patches/server/0692-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0693-Use-Velocity-compression-and-cipher-natives.patch index de7c22c15faa9..16ce3216118c0 100644 --- a/patches/server/0692-Use-Velocity-compression-and-cipher-natives.patch +++ b/patches/server/0693-Use-Velocity-compression-and-cipher-natives.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use Velocity compression and cipher natives diff --git a/build.gradle.kts b/build.gradle.kts -index 7691727bc188912cab74c6fe4546dfd7b4e68bb5..bd906c491a63ec79d5b2d0901e30dde655c0fc8a 100644 +index 61d2f46ed71a8abff05e8295ac764b4af78095de..6da6120bc37b573a5398f1593b72ffc7f569682b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -40,6 +40,11 @@ dependencies { diff --git a/patches/server/0693-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0694-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/0693-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0694-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/0694-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0695-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0694-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0695-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0695-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0696-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0695-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/server/0696-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0696-Distance-manager-tick-timings.patch b/patches/server/0697-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0696-Distance-manager-tick-timings.patch rename to patches/server/0697-Distance-manager-tick-timings.patch diff --git a/patches/server/0697-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0698-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0697-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0698-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0698-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0699-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0698-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0699-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0699-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0700-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 92% rename from patches/server/0699-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0700-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch index 6ef712fd7a902..8f7c7094af565 100644 --- a/patches/server/0699-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch +++ b/patches/server/0700-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7119c6377a86cf33e4bddbaf5db1594414b5032c..e8ca93305e8baaee3e72932b630a2d6907444593 100644 +index 979515ce93ec0cb6589158ac0b1c54f9283f96b6..3f88ea6ce570c1b86651e5095970c28cbf3c2a3d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -734,6 +734,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0700-Add-packet-limiter-config.patch b/patches/server/0701-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0700-Add-packet-limiter-config.patch rename to patches/server/0701-Add-packet-limiter-config.patch diff --git a/patches/server/0701-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0702-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0701-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0702-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0702-Ensure-valid-vehicle-status.patch b/patches/server/0703-Ensure-valid-vehicle-status.patch similarity index 90% rename from patches/server/0702-Ensure-valid-vehicle-status.patch rename to patches/server/0703-Ensure-valid-vehicle-status.patch index f0389c43e996c..45c65ee8af22a 100644 --- a/patches/server/0702-Ensure-valid-vehicle-status.patch +++ b/patches/server/0703-Ensure-valid-vehicle-status.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure valid vehicle status diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 3fdf2908d0f6ac994fa05e285d7bc365890964ac..b5b86613aea368c524ed2544b9836a834ed833ad 100644 +index c6d56a225cdaffc0b08eb4805e6bdcb0223fbd91..c9eb785457b606d8f7c4fe3f824fd6d0a1d1070e 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -569,7 +569,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0703-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0704-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0703-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0704-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0704-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0705-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0704-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0705-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0705-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0706-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0705-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0706-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0706-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0707-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0706-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0707-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0707-Preserve-overstacked-loot.patch b/patches/server/0708-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0707-Preserve-overstacked-loot.patch rename to patches/server/0708-Preserve-overstacked-loot.patch diff --git a/patches/server/0708-Update-head-rotation-in-missing-places.patch b/patches/server/0709-Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/0708-Update-head-rotation-in-missing-places.patch rename to patches/server/0709-Update-head-rotation-in-missing-places.patch diff --git a/patches/server/0709-prevent-unintended-light-block-manipulation.patch b/patches/server/0710-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0709-prevent-unintended-light-block-manipulation.patch rename to patches/server/0710-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0710-Fix-CraftCriteria-defaults-map.patch b/patches/server/0711-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0710-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0711-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0711-Fix-upstreams-block-state-factories.patch b/patches/server/0712-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0711-Fix-upstreams-block-state-factories.patch rename to patches/server/0712-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0712-Configurable-feature-seeds.patch b/patches/server/0713-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0712-Configurable-feature-seeds.patch rename to patches/server/0713-Configurable-feature-seeds.patch diff --git a/patches/server/0713-Add-root-admin-user-detection.patch b/patches/server/0714-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0713-Add-root-admin-user-detection.patch rename to patches/server/0714-Add-root-admin-user-detection.patch diff --git a/patches/server/0714-Always-allow-item-changing-in-Fireball.patch b/patches/server/0715-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0714-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0715-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0716-don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0716-don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/0716-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0717-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0716-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0717-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0717-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0718-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0717-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0718-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0718-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0719-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0718-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0719-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0719-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0720-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/0719-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0720-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/0720-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0721-Hide-unnecessary-itemmeta-from-clients.patch similarity index 100% rename from patches/server/0720-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0721-Hide-unnecessary-itemmeta-from-clients.patch diff --git a/patches/server/0721-Fix-Spigot-growth-modifiers.patch b/patches/server/0722-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0721-Fix-Spigot-growth-modifiers.patch rename to patches/server/0722-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0722-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0723-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0722-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0723-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0723-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0724-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0723-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0724-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0724-Optimize-HashMapPalette.patch b/patches/server/0725-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0724-Optimize-HashMapPalette.patch rename to patches/server/0725-Optimize-HashMapPalette.patch diff --git a/patches/server/0725-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0726-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0725-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0726-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0726-Collision-optimisations.patch b/patches/server/0727-Collision-optimisations.patch similarity index 100% rename from patches/server/0726-Collision-optimisations.patch rename to patches/server/0727-Collision-optimisations.patch diff --git a/patches/server/0727-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0728-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 99% rename from patches/server/0727-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0728-Optimise-collision-checking-in-player-move-packet-ha.patch index 07f462e68e9e0..8a8c38fd6a475 100644 --- a/patches/server/0727-Optimise-collision-checking-in-player-move-packet-ha.patch +++ b/patches/server/0728-Optimise-collision-checking-in-player-move-packet-ha.patch @@ -8,7 +8,7 @@ Move collision logic to just the hasNewCollision call instead of getCubes + hasN CHECK ME diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 65f36454b08d7527aca0d3e667979fd58f3dcf6f..b0987c149917513fd00c39da2560277df4e0549b 100644 +index 7bdb23b00cf04e54ba906d6ed10ef96cfb1a2b33..d8f9b5d56ffa79145e1b8a2c809da4d5caad2a23 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -534,7 +534,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0728-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0729-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0728-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0729-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0729-Add-more-Campfire-API.patch b/patches/server/0730-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0729-Add-more-Campfire-API.patch rename to patches/server/0730-Add-more-Campfire-API.patch diff --git a/patches/server/0730-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0731-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0730-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0731-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0731-Fix-tripwire-state-inconsistency.patch b/patches/server/0732-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0731-Fix-tripwire-state-inconsistency.patch rename to patches/server/0732-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0732-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0733-Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/0732-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0733-Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/0733-Improve-scoreboard-entries.patch b/patches/server/0734-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0733-Improve-scoreboard-entries.patch rename to patches/server/0734-Improve-scoreboard-entries.patch diff --git a/patches/server/0734-Entity-powdered-snow-API.patch b/patches/server/0735-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0734-Entity-powdered-snow-API.patch rename to patches/server/0735-Entity-powdered-snow-API.patch diff --git a/patches/server/0735-Add-API-for-item-entity-health.patch b/patches/server/0736-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0735-Add-API-for-item-entity-health.patch rename to patches/server/0736-Add-API-for-item-entity-health.patch diff --git a/patches/server/0736-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0737-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0736-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0737-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0737-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0738-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0737-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0738-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0738-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0739-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0738-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0739-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0739-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0740-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0739-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0740-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0740-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0741-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0740-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0741-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0741-Fix-bees-aging-inside-hives.patch b/patches/server/0742-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0741-Fix-bees-aging-inside-hives.patch rename to patches/server/0742-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0742-Bucketable-API.patch b/patches/server/0743-Bucketable-API.patch similarity index 100% rename from patches/server/0742-Bucketable-API.patch rename to patches/server/0743-Bucketable-API.patch diff --git a/patches/server/0743-Validate-usernames.patch b/patches/server/0744-Validate-usernames.patch similarity index 100% rename from patches/server/0743-Validate-usernames.patch rename to patches/server/0744-Validate-usernames.patch diff --git a/patches/server/0744-Make-water-animal-spawn-height-configurable.patch b/patches/server/0745-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0744-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0745-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0745-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0746-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 98% rename from patches/server/0745-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0746-Expose-vanilla-BiomeProvider-from-WorldInfo.patch index 3ba6efd94a620..83b64455e5977 100644 --- a/patches/server/0745-Expose-vanilla-BiomeProvider-from-WorldInfo.patch +++ b/patches/server/0746-Expose-vanilla-BiomeProvider-from-WorldInfo.patch @@ -31,7 +31,7 @@ index c103ac154104a1e50ed687a2154a1e0e579b786a..73738d920a7a5776165eb3586ddf0676 biomeProvider = generator.getDefaultBiomeProvider(worldInfo); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 4de85b0f3b77d838c91e79b1126e39d41c1f6132..cabdea2666286956696bc3681dab32b02ab6c0da 100644 +index e0a221639148c0b28c16ecd4cd45e2b3af16699f..d500962858fc9598481ff019bda1d1a7ad1813b7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -203,6 +203,29 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0746-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0747-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0746-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0747-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0747-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0748-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/server/0747-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/server/0748-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/server/0748-Multiple-Entries-with-Scoreboards.patch b/patches/server/0749-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0748-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0749-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0749-Reset-placed-block-on-exception.patch b/patches/server/0750-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0749-Reset-placed-block-on-exception.patch rename to patches/server/0750-Reset-placed-block-on-exception.patch diff --git a/patches/server/0750-Add-configurable-height-for-slime-spawn.patch b/patches/server/0751-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0750-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0751-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0751-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0752-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0751-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0752-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0752-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0753-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0752-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0753-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0753-Kick-on-main-for-illegal-chat.patch b/patches/server/0754-Kick-on-main-for-illegal-chat.patch similarity index 96% rename from patches/server/0753-Kick-on-main-for-illegal-chat.patch rename to patches/server/0754-Kick-on-main-for-illegal-chat.patch index d4075b227331b..540f62d05d2ba 100644 --- a/patches/server/0753-Kick-on-main-for-illegal-chat.patch +++ b/patches/server/0754-Kick-on-main-for-illegal-chat.patch @@ -7,7 +7,7 @@ Makes the PlayerKickEvent fire on the main thread for illegal characters or chat out-of-order errors. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b0987c149917513fd00c39da2560277df4e0549b..e8302e9be8fda770e1396da40107ed22338de31b 100644 +index d8f9b5d56ffa79145e1b8a2c809da4d5caad2a23..ec1bec4f3ecdabad7ecf0a99f6edc1e2132a2c9e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2021,7 +2021,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0754-Multi-Block-Change-API-Implementation.patch b/patches/server/0755-Multi-Block-Change-API-Implementation.patch similarity index 100% rename from patches/server/0754-Multi-Block-Change-API-Implementation.patch rename to patches/server/0755-Multi-Block-Change-API-Implementation.patch diff --git a/patches/server/0755-Fix-NotePlayEvent.patch b/patches/server/0756-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0755-Fix-NotePlayEvent.patch rename to patches/server/0756-Fix-NotePlayEvent.patch diff --git a/patches/server/0756-Freeze-Tick-Lock-API.patch b/patches/server/0757-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/server/0756-Freeze-Tick-Lock-API.patch rename to patches/server/0757-Freeze-Tick-Lock-API.patch diff --git a/patches/server/0757-Dolphin-API.patch b/patches/server/0758-Dolphin-API.patch similarity index 100% rename from patches/server/0757-Dolphin-API.patch rename to patches/server/0758-Dolphin-API.patch diff --git a/patches/server/0758-More-PotionEffectType-API.patch b/patches/server/0759-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0758-More-PotionEffectType-API.patch rename to patches/server/0759-More-PotionEffectType-API.patch diff --git a/patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0760-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0760-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0760-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0761-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/server/0760-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0761-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/server/0761-Add-missing-structure-set-seed-configs.patch b/patches/server/0762-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0761-Add-missing-structure-set-seed-configs.patch rename to patches/server/0762-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0762-Implement-regenerateChunk.patch b/patches/server/0763-Implement-regenerateChunk.patch similarity index 98% rename from patches/server/0762-Implement-regenerateChunk.patch rename to patches/server/0763-Implement-regenerateChunk.patch index 711322ca1fe33..205a09260d245 100644 --- a/patches/server/0762-Implement-regenerateChunk.patch +++ b/patches/server/0763-Implement-regenerateChunk.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com> diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index cabdea2666286956696bc3681dab32b02ab6c0da..056ced9d7b79b96ed33fe5656609863d9cb76b35 100644 +index d500962858fc9598481ff019bda1d1a7ad1813b7..6185477e9fc0ab2ed4e8e5835cc6e8e1adc79ef9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -142,6 +142,7 @@ import org.jetbrains.annotations.NotNull; diff --git a/patches/server/0763-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0764-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0763-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0764-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0764-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0765-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/0764-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0765-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/0765-Add-GameEvent-tags.patch b/patches/server/0766-Add-GameEvent-tags.patch similarity index 100% rename from patches/server/0765-Add-GameEvent-tags.patch rename to patches/server/0766-Add-GameEvent-tags.patch diff --git a/patches/server/0766-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0767-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0766-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0767-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0767-Furnace-RecipesUsed-API.patch b/patches/server/0768-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0767-Furnace-RecipesUsed-API.patch rename to patches/server/0768-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0768-Configurable-sculk-sensor-listener-range.patch b/patches/server/0769-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0768-Configurable-sculk-sensor-listener-range.patch rename to patches/server/0769-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0769-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0770-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0769-Add-missing-block-data-mins-and-maxes.patch rename to patches/server/0770-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0770-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0771-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0770-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/server/0771-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0771-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0772-Put-world-into-worldlist-before-initing-the-world.patch similarity index 100% rename from patches/server/0771-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/server/0772-Put-world-into-worldlist-before-initing-the-world.patch diff --git a/patches/server/0772-Fix-Entity-Position-Desync.patch b/patches/server/0773-Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/0772-Fix-Entity-Position-Desync.patch rename to patches/server/0773-Fix-Entity-Position-Desync.patch diff --git a/patches/server/0773-Custom-Potion-Mixes.patch b/patches/server/0774-Custom-Potion-Mixes.patch similarity index 100% rename from patches/server/0773-Custom-Potion-Mixes.patch rename to patches/server/0774-Custom-Potion-Mixes.patch diff --git a/patches/server/0774-Force-close-world-loading-screen.patch b/patches/server/0775-Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/0774-Force-close-world-loading-screen.patch rename to patches/server/0775-Force-close-world-loading-screen.patch diff --git a/patches/server/0775-Fix-falling-block-spawn-methods.patch b/patches/server/0776-Fix-falling-block-spawn-methods.patch similarity index 100% rename from patches/server/0775-Fix-falling-block-spawn-methods.patch rename to patches/server/0776-Fix-falling-block-spawn-methods.patch diff --git a/patches/server/0776-Expose-furnace-minecart-push-values.patch b/patches/server/0777-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0776-Expose-furnace-minecart-push-values.patch rename to patches/server/0777-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0777-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0778-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/0777-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/server/0778-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/0778-More-Projectile-API.patch b/patches/server/0779-More-Projectile-API.patch similarity index 100% rename from patches/server/0778-More-Projectile-API.patch rename to patches/server/0779-More-Projectile-API.patch diff --git a/patches/server/0779-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0780-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0779-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/server/0780-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0780-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0781-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 93% rename from patches/server/0780-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/server/0781-Don-t-allow-vehicle-movement-from-players-while-tele.patch index af0968bf69003..277372d88a9fc 100644 --- a/patches/server/0780-Don-t-allow-vehicle-movement-from-players-while-tele.patch +++ b/patches/server/0781-Don-t-allow-vehicle-movement-from-players-while-tele.patch @@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the regular player move packet. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e8302e9be8fda770e1396da40107ed22338de31b..42860936789e66128615d3d2dc7a2a7bf139240b 100644 +index ec1bec4f3ecdabad7ecf0a99f6edc1e2132a2c9e..db7d4a74021873a86a06f39c43d36804d97e4fdb 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -463,6 +463,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0781-Implement-getComputedBiome-API.patch b/patches/server/0782-Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/0781-Implement-getComputedBiome-API.patch rename to patches/server/0782-Implement-getComputedBiome-API.patch diff --git a/patches/server/0782-Make-some-itemstacks-nonnull.patch b/patches/server/0783-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0782-Make-some-itemstacks-nonnull.patch rename to patches/server/0783-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0783-Implement-enchantWithLevels-API.patch b/patches/server/0784-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0783-Implement-enchantWithLevels-API.patch rename to patches/server/0784-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0784-Fix-saving-in-unloadWorld.patch b/patches/server/0785-Fix-saving-in-unloadWorld.patch similarity index 100% rename from patches/server/0784-Fix-saving-in-unloadWorld.patch rename to patches/server/0785-Fix-saving-in-unloadWorld.patch diff --git a/patches/server/0785-Buffer-OOB-setBlock-calls.patch b/patches/server/0786-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0785-Buffer-OOB-setBlock-calls.patch rename to patches/server/0786-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0786-Add-TameableDeathMessageEvent.patch b/patches/server/0787-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0786-Add-TameableDeathMessageEvent.patch rename to patches/server/0787-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0787-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0788-Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/0787-Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/server/0788-Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/0788-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0789-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 92% rename from patches/server/0788-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/server/0789-fix-player-loottables-running-when-mob-loot-gamerule.patch index f4969cc5bd4bc..f9bd8d3a22215 100644 --- a/patches/server/0788-fix-player-loottables-running-when-mob-loot-gamerule.patch +++ b/patches/server/0789-fix-player-loottables-running-when-mob-loot-gamerule.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix player loottables running when mob loot gamerule is false diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index f5fb414087d4346e7d83b8f3ed847731cb03052d..6f7d2990a8562fb670c6800144d67e3becc56c6d 100644 +index 19f94236df83d73686aded9658a6469b3840c0c3..fb7a40e6670a2f7522fe2b1b98d5489c54961d3f 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -917,12 +917,14 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0789-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0790-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 100% rename from patches/server/0789-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/server/0790-Ensure-entity-passenger-world-matches-ridden-entity.patch diff --git a/patches/server/0790-Guard-against-invalid-entity-positions.patch b/patches/server/0791-Guard-against-invalid-entity-positions.patch similarity index 100% rename from patches/server/0790-Guard-against-invalid-entity-positions.patch rename to patches/server/0791-Guard-against-invalid-entity-positions.patch diff --git a/patches/server/0791-cache-resource-keys.patch b/patches/server/0792-cache-resource-keys.patch similarity index 100% rename from patches/server/0791-cache-resource-keys.patch rename to patches/server/0792-cache-resource-keys.patch diff --git a/patches/server/0792-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0793-Allow-to-change-the-podium-for-the-EnderDragon.patch similarity index 100% rename from patches/server/0792-Allow-to-change-the-podium-for-the-EnderDragon.patch rename to patches/server/0793-Allow-to-change-the-podium-for-the-EnderDragon.patch diff --git a/patches/server/0793-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0794-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0793-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/server/0794-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0794-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0795-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch similarity index 100% rename from patches/server/0794-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch rename to patches/server/0795-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch diff --git a/patches/server/0795-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0796-Prevent-tile-entity-copies-loading-chunks.patch similarity index 100% rename from patches/server/0795-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/server/0796-Prevent-tile-entity-copies-loading-chunks.patch diff --git a/patches/server/0796-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0797-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/server/0796-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/server/0797-Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/server/0797-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0798-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch similarity index 100% rename from patches/server/0797-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch rename to patches/server/0798-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch diff --git a/patches/server/0798-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0799-Pass-ServerLevel-for-gamerule-callbacks.patch similarity index 98% rename from patches/server/0798-Pass-ServerLevel-for-gamerule-callbacks.patch rename to patches/server/0799-Pass-ServerLevel-for-gamerule-callbacks.patch index fa7195f29727d..aaf785c1073b8 100644 --- a/patches/server/0798-Pass-ServerLevel-for-gamerule-callbacks.patch +++ b/patches/server/0799-Pass-ServerLevel-for-gamerule-callbacks.patch @@ -18,7 +18,7 @@ index c7894892afe97eb3cb453c37a2d9a23d811d70b8..2d06a8f85c5e29688aa0fd4726fd5767 if (dedicatedserverproperties.enableQuery) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7f96ba2095bee348cb6bb7796471aa7cdd1999d3..aa3926339c698038560f3eb2671917c9d5882fee 100644 +index 43ee0a36ace19a29f4e63133462ffc63a88b38e4..bea158416ed6c13db633efb742153f7813df5540 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2751,7 +2751,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -167,7 +167,7 @@ index 2e240ad721928a9a68370114ba61c21884ef1472..1a72fc5368731be617f9cab72e9e756d this.onChanged(server); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 3238c3f152ed09eab935a62e044c48ca21d1cf1c..9f46cbc5c9ff75cb67fad6a4f8a62ba3da841c91 100644 +index b964c5e81422a90f605191e2822ece425679396b..c5b6957aca67739a2d265ca985a0cc5b35c9c1e6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1950,7 +1950,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0799-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0800-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/server/0799-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/server/0800-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/server/0800-WorldCreator-keepSpawnLoaded.patch b/patches/server/0801-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/server/0800-WorldCreator-keepSpawnLoaded.patch rename to patches/server/0801-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/server/0801-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0802-Fix-CME-in-CraftPersistentDataTypeRegistry.patch similarity index 100% rename from patches/server/0801-Fix-CME-in-CraftPersistentDataTypeRegistry.patch rename to patches/server/0802-Fix-CME-in-CraftPersistentDataTypeRegistry.patch diff --git a/patches/server/0802-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0803-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/server/0802-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/server/0803-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/server/0803-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0804-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0803-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/server/0804-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0804-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0805-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0804-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/server/0805-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0805-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0806-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0805-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/server/0806-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0806-Add-PlayerStopUsingItemEvent.patch b/patches/server/0807-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/server/0806-Add-PlayerStopUsingItemEvent.patch rename to patches/server/0807-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/server/0807-Don-t-tick-markers.patch b/patches/server/0808-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0807-Don-t-tick-markers.patch rename to patches/server/0808-Don-t-tick-markers.patch diff --git a/patches/server/0808-Expand-FallingBlock-API.patch b/patches/server/0809-Expand-FallingBlock-API.patch similarity index 100% rename from patches/server/0808-Expand-FallingBlock-API.patch rename to patches/server/0809-Expand-FallingBlock-API.patch diff --git a/patches/server/0809-Do-not-accept-invalid-client-settings.patch b/patches/server/0810-Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/0809-Do-not-accept-invalid-client-settings.patch rename to patches/server/0810-Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/0810-Add-support-for-Proxy-Protocol.patch b/patches/server/0811-Add-support-for-Proxy-Protocol.patch similarity index 97% rename from patches/server/0810-Add-support-for-Proxy-Protocol.patch rename to patches/server/0811-Add-support-for-Proxy-Protocol.patch index 55d8e2f7b54e2..30de84af65919 100644 --- a/patches/server/0810-Add-support-for-Proxy-Protocol.patch +++ b/patches/server/0811-Add-support-for-Proxy-Protocol.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add support for Proxy Protocol diff --git a/build.gradle.kts b/build.gradle.kts -index bd906c491a63ec79d5b2d0901e30dde655c0fc8a..cf538869bcf4e89825a96870e24b828880389c5c 100644 +index 6da6120bc37b573a5398f1593b72ffc7f569682b..79beac737c17412913983614bd478d33e3c6ed58 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -30,6 +30,7 @@ dependencies { diff --git a/patches/server/0811-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0812-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0811-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/server/0812-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0812-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0813-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0812-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/server/0813-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0813-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0814-Sanitize-Sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0813-Sanitize-Sent-BlockEntity-NBT.patch rename to patches/server/0814-Sanitize-Sent-BlockEntity-NBT.patch diff --git a/patches/server/0814-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0815-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0814-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/server/0815-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0815-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0816-Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/server/0815-Prevent-entity-loading-causing-async-lookups.patch rename to patches/server/0816-Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/server/0816-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0817-Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/server/0816-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/server/0817-Throw-exception-on-world-create-while-being-ticked.patch diff --git a/patches/server/0817-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0818-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/0817-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/0818-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/0818-Dont-resent-entity-on-art-update.patch b/patches/server/0819-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0818-Dont-resent-entity-on-art-update.patch rename to patches/server/0819-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0819-Add-WardenAngerChangeEvent.patch b/patches/server/0820-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0819-Add-WardenAngerChangeEvent.patch rename to patches/server/0820-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0820-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0821-Add-option-for-strict-advancement-dimension-checks.patch similarity index 96% rename from patches/server/0820-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/0821-Add-option-for-strict-advancement-dimension-checks.patch index 7a01fc369eb93..1a0d9c5a704dd 100644 --- a/patches/server/0820-Add-option-for-strict-advancement-dimension-checks.patch +++ b/patches/server/0821-Add-option-for-strict-advancement-dimension-checks.patch @@ -24,7 +24,7 @@ index d4a673a9fb604876c554f955ed13ad31a2adb217..e75b3df4db9cb618aef4837acb8cde92 } else { BlockPos blockPos = BlockPos.containing(x, y, z); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 6f7d2990a8562fb670c6800144d67e3becc56c6d..dfc4b41df11a5ce74e490303f56db65cd1df4d9a 100644 +index fb7a40e6670a2f7522fe2b1b98d5489c54961d3f..915126c0ee30180a81e5143086a958fb900929c6 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1316,6 +1316,12 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0821-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0822-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0821-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/0822-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0822-Nameable-Banner-API.patch b/patches/server/0823-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0822-Nameable-Banner-API.patch rename to patches/server/0823-Nameable-Banner-API.patch diff --git a/patches/server/0823-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0824-Don-t-broadcast-messages-to-command-blocks.patch similarity index 100% rename from patches/server/0823-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/0824-Don-t-broadcast-messages-to-command-blocks.patch diff --git a/patches/server/0824-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0825-Prevent-empty-items-from-being-added-to-world.patch similarity index 100% rename from patches/server/0824-Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/0825-Prevent-empty-items-from-being-added-to-world.patch diff --git a/patches/server/0825-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0826-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0825-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/0826-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0826-Add-Player-getFishHook.patch b/patches/server/0827-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0826-Add-Player-getFishHook.patch rename to patches/server/0827-Add-Player-getFishHook.patch diff --git a/patches/server/0827-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0828-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0827-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/0828-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0828-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0829-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/server/0828-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/0829-Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/server/0829-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0830-Add-some-minimal-debug-information-to-chat-packet-er.patch similarity index 94% rename from patches/server/0829-Add-some-minimal-debug-information-to-chat-packet-er.patch rename to patches/server/0830-Add-some-minimal-debug-information-to-chat-packet-er.patch index f79a1a6a1eb74..7d232d5b1a656 100644 --- a/patches/server/0829-Add-some-minimal-debug-information-to-chat-packet-er.patch +++ b/patches/server/0830-Add-some-minimal-debug-information-to-chat-packet-er.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add some minimal debug information to chat packet errors TODO: potentially add some kick leeway diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ba86bc53af2e9574a4fbaaf052df4f4cc5d752bd..6ae39de0ac64e6a5757972c6cee85c37f641d9fd 100644 +index 616ea3055c854872fbb5754bdf0b67deac1b4b58..e6efb852e2454294073968de546b5c61b6131766 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2148,7 +2148,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0830-Fix-Bee-flower-NPE.patch b/patches/server/0831-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0830-Fix-Bee-flower-NPE.patch rename to patches/server/0831-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0831-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0832-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 92% rename from patches/server/0831-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/server/0832-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch index 6b2b48140b5ba..2eb8c8b5165ec 100644 --- a/patches/server/0831-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch +++ b/patches/server/0832-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 6ae39de0ac64e6a5757972c6cee85c37f641d9fd..b1be147250d3850930e103a2fa2823a6c992f0dd 100644 +index e6efb852e2454294073968de546b5c61b6131766..3663332ddc408b1f918b9f7b0a461a346073c9a4 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2368,7 +2368,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0832-More-Teleport-API.patch b/patches/server/0833-More-Teleport-API.patch similarity index 100% rename from patches/server/0832-More-Teleport-API.patch rename to patches/server/0833-More-Teleport-API.patch diff --git a/patches/server/0833-Add-EntityPortalReadyEvent.patch b/patches/server/0834-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/server/0833-Add-EntityPortalReadyEvent.patch rename to patches/server/0834-Add-EntityPortalReadyEvent.patch diff --git a/patches/server/0834-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0835-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0834-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0835-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0835-Send-block-entities-after-destroy-prediction.patch b/patches/server/0836-Send-block-entities-after-destroy-prediction.patch similarity index 98% rename from patches/server/0835-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0836-Send-block-entities-after-destroy-prediction.patch index 509dc02f756a0..d8a6e3fc1fc94 100644 --- a/patches/server/0835-Send-block-entities-after-destroy-prediction.patch +++ b/patches/server/0836-Send-block-entities-after-destroy-prediction.patch @@ -57,7 +57,7 @@ index 96fde7b84ce4d195d0c54deff71df9fcf8447979..6cc9c28032cafd15d884223a01208ce6 } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 675467a6552cfc1f951e7c81a9be0d423cae8c44..db5368bf4970c63f21ef1e5fc7428787c90de4dd 100644 +index ca4e4d5f272f2368a966a9eead1ba047c4cbc77a..1c98d65ed237d63faabcef64093957aef3157abf 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1751,8 +1751,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0836-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0837-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/server/0836-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0837-Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/server/0837-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0838-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/server/0837-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0838-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/server/0838-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0839-Add-and-fix-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0838-Add-and-fix-missing-BlockFadeEvents.patch rename to patches/server/0839-Add-and-fix-missing-BlockFadeEvents.patch diff --git a/patches/server/0839-Collision-API.patch b/patches/server/0840-Collision-API.patch similarity index 100% rename from patches/server/0839-Collision-API.patch rename to patches/server/0840-Collision-API.patch diff --git a/patches/server/0840-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0841-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0840-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0841-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0841-Block-Ticking-API.patch b/patches/server/0842-Block-Ticking-API.patch similarity index 100% rename from patches/server/0841-Block-Ticking-API.patch rename to patches/server/0842-Block-Ticking-API.patch diff --git a/patches/server/0842-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0843-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0842-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0843-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0843-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0844-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch similarity index 100% rename from patches/server/0843-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch rename to patches/server/0844-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch diff --git a/patches/server/0844-Add-NamespacedKey-biome-methods.patch b/patches/server/0845-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0844-Add-NamespacedKey-biome-methods.patch rename to patches/server/0845-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0845-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0846-Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/server/0845-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0846-Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/server/0846-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0847-Stop-large-look-changes-from-crashing-the-server.patch similarity index 100% rename from patches/server/0846-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/server/0847-Stop-large-look-changes-from-crashing-the-server.patch diff --git a/patches/server/0847-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0848-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0847-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0848-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0848-Missing-eating-regain-reason.patch b/patches/server/0849-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0848-Missing-eating-regain-reason.patch rename to patches/server/0849-Missing-eating-regain-reason.patch diff --git a/patches/server/0849-Missing-effect-cause.patch b/patches/server/0850-Missing-effect-cause.patch similarity index 100% rename from patches/server/0849-Missing-effect-cause.patch rename to patches/server/0850-Missing-effect-cause.patch diff --git a/patches/server/0850-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0851-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0850-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0851-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0851-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0852-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/0851-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/server/0852-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/0852-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0853-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0852-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0853-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0853-Configurable-chat-thread-limit.patch b/patches/server/0854-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0853-Configurable-chat-thread-limit.patch rename to patches/server/0854-Configurable-chat-thread-limit.patch diff --git a/patches/server/0854-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0855-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0854-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0855-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0855-fix-Jigsaw-block-kicking-user.patch b/patches/server/0856-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0855-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0856-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0856-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0857-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0856-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0857-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0857-Add-getDrops-to-BlockState.patch b/patches/server/0858-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/0857-Add-getDrops-to-BlockState.patch rename to patches/server/0858-Add-getDrops-to-BlockState.patch diff --git a/patches/server/0858-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0859-Fix-a-bunch-of-vanilla-bugs.patch similarity index 100% rename from patches/server/0858-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0859-Fix-a-bunch-of-vanilla-bugs.patch diff --git a/patches/server/0859-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0860-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/0859-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0860-Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/0860-Fix-custom-piglin-loved-items.patch b/patches/server/0861-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0860-Fix-custom-piglin-loved-items.patch rename to patches/server/0861-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0861-EntityPickupItemEvent-fixes.patch b/patches/server/0862-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0861-EntityPickupItemEvent-fixes.patch rename to patches/server/0862-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0862-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0863-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0862-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0863-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0863-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0864-Add-PlayerInventorySlotChangeEvent.patch similarity index 97% rename from patches/server/0863-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0864-Add-PlayerInventorySlotChangeEvent.patch index 32c1b2217b02e..f004546ff1cb8 100644 --- a/patches/server/0863-Add-PlayerInventorySlotChangeEvent.patch +++ b/patches/server/0864-Add-PlayerInventorySlotChangeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerInventorySlotChangeEvent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index dfc4b41df11a5ce74e490303f56db65cd1df4d9a..a9cd91adcdbe8589e8662426af8477473326b957 100644 +index 915126c0ee30180a81e5143086a958fb900929c6..bf17062ff3d7eb3085070f5186ab6477e9c1338e 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -372,6 +372,25 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0864-Elder-Guardian-appearance-API.patch b/patches/server/0865-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/0864-Elder-Guardian-appearance-API.patch rename to patches/server/0865-Elder-Guardian-appearance-API.patch diff --git a/patches/server/0865-Allow-changing-bed-s-occupied-property.patch b/patches/server/0866-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0865-Allow-changing-bed-s-occupied-property.patch rename to patches/server/0866-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0866-Add-entity-knockback-API.patch b/patches/server/0867-Add-entity-knockback-API.patch similarity index 91% rename from patches/server/0866-Add-entity-knockback-API.patch rename to patches/server/0867-Add-entity-knockback-API.patch index a7530e45fbab5..c08d2b3f952f0 100644 --- a/patches/server/0866-Add-entity-knockback-API.patch +++ b/patches/server/0867-Add-entity-knockback-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add entity knockback API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index f0d8000915db9ae497dddb09e9bde87a516a1b4b..f466b51947e1e6ed9e20ee1e5a0a535e9614efaa 100644 +index 8c8431f40e9415b32e43acea4cd91a20d82d8d08..bdaa21becdc17823628542d612daf2e055a273c8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -1016,5 +1016,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0867-Detect-headless-JREs.patch b/patches/server/0868-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0867-Detect-headless-JREs.patch rename to patches/server/0868-Detect-headless-JREs.patch diff --git a/patches/server/0868-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0869-fixed-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0868-fixed-entity-vehicle-collision-event-not-called.patch rename to patches/server/0869-fixed-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0869-optimized-dirt-and-snow-spreading.patch b/patches/server/0870-optimized-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/0869-optimized-dirt-and-snow-spreading.patch rename to patches/server/0870-optimized-dirt-and-snow-spreading.patch diff --git a/patches/server/0870-Added-EntityToggleSitEvent.patch b/patches/server/0871-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0870-Added-EntityToggleSitEvent.patch rename to patches/server/0871-Added-EntityToggleSitEvent.patch diff --git a/patches/server/0871-Add-fire-tick-delay-option.patch b/patches/server/0872-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0871-Add-fire-tick-delay-option.patch rename to patches/server/0872-Add-fire-tick-delay-option.patch diff --git a/patches/server/0872-Add-Moving-Piston-API.patch b/patches/server/0873-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0872-Add-Moving-Piston-API.patch rename to patches/server/0873-Add-Moving-Piston-API.patch diff --git a/patches/server/0873-Ignore-impossible-spawn-tick.patch b/patches/server/0874-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0873-Ignore-impossible-spawn-tick.patch rename to patches/server/0874-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0874-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0875-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0874-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/server/0875-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0875-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0876-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0875-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/server/0876-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0876-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0877-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0876-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0877-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0877-Prevent-compass-from-loading-chunks.patch b/patches/server/0878-Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/0877-Prevent-compass-from-loading-chunks.patch rename to patches/server/0878-Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/0878-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0879-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0878-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0879-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0879-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0880-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0879-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0880-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0880-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0881-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0880-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0881-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0881-Add-Player-Warden-Warning-API.patch b/patches/server/0882-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0881-Add-Player-Warden-Warning-API.patch rename to patches/server/0882-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0882-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0883-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0882-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0883-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0883-Add-paper-dumplisteners-command.patch b/patches/server/0884-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0883-Add-paper-dumplisteners-command.patch rename to patches/server/0884-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0884-check-global-player-list-where-appropriate.patch b/patches/server/0885-check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/server/0884-check-global-player-list-where-appropriate.patch rename to patches/server/0885-check-global-player-list-where-appropriate.patch diff --git a/patches/server/0885-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0886-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0885-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0886-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0886-ItemStack-damage-API.patch b/patches/server/0887-ItemStack-damage-API.patch similarity index 97% rename from patches/server/0886-ItemStack-damage-API.patch rename to patches/server/0887-ItemStack-damage-API.patch index c46fbd71d92c2..2de74483ab9bc 100644 --- a/patches/server/0886-ItemStack-damage-API.patch +++ b/patches/server/0887-ItemStack-damage-API.patch @@ -11,7 +11,7 @@ the logic associated with damaging them public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index f466b51947e1e6ed9e20ee1e5a0a535e9614efaa..4971f918a014ba418f95a0d438aa3531eeef6908 100644 +index bdaa21becdc17823628542d612daf2e055a273c8..725053ca75b0747d69ab3ec8e7035f9b58b82a8c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -1017,6 +1017,53 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0887-Friction-API.patch b/patches/server/0888-Friction-API.patch similarity index 97% rename from patches/server/0887-Friction-API.patch rename to patches/server/0888-Friction-API.patch index 0a3891482dcc0..b18e996bafa6a 100644 --- a/patches/server/0887-Friction-API.patch +++ b/patches/server/0888-Friction-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Friction API diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 34585981d45712d9119a97485ccc611d2c02e452..a28a7de154da42d24f9a96ba2f0a52aefd9febf5 100644 +index 4ed23c6143a96e75b0e2e060861dd7c702ce6a95..a9ee6deb5954e8bb9eaf93897f4eacdd481a61c5 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -262,6 +262,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -132,7 +132,7 @@ index 0a075ad3bbe13abc20c1f344cb706278b27bb202..9c0f83ff8113696309265fb9e8f60062 public int getHealth() { return this.getHandle().health; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 4971f918a014ba418f95a0d438aa3531eeef6908..b4b56bebf5308f4dcc51c1a2815f9689a6918b13 100644 +index 725053ca75b0747d69ab3ec8e7035f9b58b82a8c..6ec847b7928cf4217f4588cbb35224fe8db85fd4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -1064,6 +1064,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0888-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0889-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0888-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0889-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0889-Fix-player-kick-on-shutdown.patch b/patches/server/0890-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0889-Fix-player-kick-on-shutdown.patch rename to patches/server/0890-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0890-Sync-offhand-slot-in-menus.patch b/patches/server/0891-Sync-offhand-slot-in-menus.patch similarity index 97% rename from patches/server/0890-Sync-offhand-slot-in-menus.patch rename to patches/server/0891-Sync-offhand-slot-in-menus.patch index 7d2345f4eb8f0..aef2af9e405a4 100644 --- a/patches/server/0890-Sync-offhand-slot-in-menus.patch +++ b/patches/server/0891-Sync-offhand-slot-in-menus.patch @@ -8,7 +8,7 @@ offhand slot isn't sent. This is not correct because you *can* put stuff into th by pressing the offhand swap item diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a9cd91adcdbe8589e8662426af8477473326b957..06b455632ce3fc495cd41a61ce5a8a9f06461b1d 100644 +index bf17062ff3d7eb3085070f5186ab6477e9c1338e..76d513c61eec05edc8b037f2567562fb677f2d95 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -341,6 +341,13 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0891-Player-Entity-Tracking-Events.patch b/patches/server/0892-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0891-Player-Entity-Tracking-Events.patch rename to patches/server/0892-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0892-Limit-pet-look-distance.patch b/patches/server/0893-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0892-Limit-pet-look-distance.patch rename to patches/server/0893-Limit-pet-look-distance.patch diff --git a/patches/server/0893-Properly-resend-entities.patch b/patches/server/0894-Properly-resend-entities.patch similarity index 100% rename from patches/server/0893-Properly-resend-entities.patch rename to patches/server/0894-Properly-resend-entities.patch diff --git a/patches/server/0894-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0895-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0894-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0895-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0895-fix-Instruments.patch b/patches/server/0896-fix-Instruments.patch similarity index 100% rename from patches/server/0895-fix-Instruments.patch rename to patches/server/0896-fix-Instruments.patch diff --git a/patches/server/0896-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0897-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0896-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0897-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0897-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0898-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0897-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0898-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0898-Add-BlockLockCheckEvent.patch b/patches/server/0899-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0898-Add-BlockLockCheckEvent.patch rename to patches/server/0899-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0899-Add-Sneaking-API-for-Entities.patch b/patches/server/0900-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0899-Add-Sneaking-API-for-Entities.patch rename to patches/server/0900-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0900-Improve-logging-and-errors.patch b/patches/server/0901-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0900-Improve-logging-and-errors.patch rename to patches/server/0901-Improve-logging-and-errors.patch diff --git a/patches/server/0901-Improve-PortalEvents.patch b/patches/server/0902-Improve-PortalEvents.patch similarity index 100% rename from patches/server/0901-Improve-PortalEvents.patch rename to patches/server/0902-Improve-PortalEvents.patch diff --git a/patches/server/0902-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0903-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0902-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0903-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0903-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0904-Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/0903-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0904-Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/0904-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0905-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0904-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0905-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0905-Flying-Fall-Damage.patch b/patches/server/0906-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0905-Flying-Fall-Damage.patch rename to patches/server/0906-Flying-Fall-Damage.patch diff --git a/patches/server/0906-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0907-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch similarity index 100% rename from patches/server/0906-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch rename to patches/server/0907-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch diff --git a/patches/server/0907-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0908-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0907-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0908-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0908-config-for-disabling-entity-tag-tags.patch b/patches/server/0909-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0908-config-for-disabling-entity-tag-tags.patch rename to patches/server/0909-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0909-Use-single-player-info-update-packet-on-join.patch b/patches/server/0910-Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/0909-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0910-Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/0910-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0911-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0910-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0911-Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/0911-Win-Screen-API.patch b/patches/server/0912-Win-Screen-API.patch similarity index 100% rename from patches/server/0911-Win-Screen-API.patch rename to patches/server/0912-Win-Screen-API.patch diff --git a/patches/server/0912-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0913-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0912-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0913-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0913-Fix-force-opening-enchantment-tables.patch b/patches/server/0914-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0913-Fix-force-opening-enchantment-tables.patch rename to patches/server/0914-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0914-Add-Entity-Body-Yaw-API.patch b/patches/server/0915-Add-Entity-Body-Yaw-API.patch similarity index 96% rename from patches/server/0914-Add-Entity-Body-Yaw-API.patch rename to patches/server/0915-Add-Entity-Body-Yaw-API.patch index 365ecd7f9df37..1eed2eca74ed4 100644 --- a/patches/server/0914-Add-Entity-Body-Yaw-API.patch +++ b/patches/server/0915-Add-Entity-Body-Yaw-API.patch @@ -41,7 +41,7 @@ index d97bc672a8e6fb7c2a0ed668cc15b54bf4254217..314168d162f1242eca67706fd3fa225f // Paper Start - Collision API @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index b4b56bebf5308f4dcc51c1a2815f9689a6918b13..e997aebe36436570e2461a4685f0fb371ce4ce14 100644 +index 6ec847b7928cf4217f4588cbb35224fe8db85fd4..bb5980b7e265860968bc86216f2f3ad47301830c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -1056,6 +1056,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0915-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0916-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0915-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0916-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0916-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0917-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 100% rename from patches/server/0916-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/server/0917-Update-the-flag-when-a-captured-block-state-is-outda.patch diff --git a/patches/server/0917-Add-EntityFertilizeEggEvent.patch b/patches/server/0918-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0917-Add-EntityFertilizeEggEvent.patch rename to patches/server/0918-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0918-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0919-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0918-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0919-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0919-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0920-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0919-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0920-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0920-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0921-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0920-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0921-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0921-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0922-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0921-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0922-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0922-Fix-text-display-error-on-spawn.patch b/patches/server/0923-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0922-Fix-text-display-error-on-spawn.patch rename to patches/server/0923-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0923-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0924-Fix-certain-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0923-Fix-certain-inventories-returning-null-Locations.patch rename to patches/server/0924-Fix-certain-inventories-returning-null-Locations.patch diff --git a/patches/server/0924-Add-Shearable-API.patch b/patches/server/0925-Add-Shearable-API.patch similarity index 100% rename from patches/server/0924-Add-Shearable-API.patch rename to patches/server/0925-Add-Shearable-API.patch diff --git a/patches/server/0925-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0926-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0925-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0926-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0926-Optimize-Hoppers.patch b/patches/server/0927-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0926-Optimize-Hoppers.patch rename to patches/server/0927-Optimize-Hoppers.patch diff --git a/patches/server/0927-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0928-Fix-beehives-generating-from-using-bonemeal.patch similarity index 100% rename from patches/server/0927-Fix-beehives-generating-from-using-bonemeal.patch rename to patches/server/0928-Fix-beehives-generating-from-using-bonemeal.patch diff --git a/patches/server/0928-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0929-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0928-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/0929-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0929-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0930-Treat-sequence-violations-like-they-should-be.patch similarity index 91% rename from patches/server/0929-Treat-sequence-violations-like-they-should-be.patch rename to patches/server/0930-Treat-sequence-violations-like-they-should-be.patch index 73867d90b5161..8ab571c188429 100644 --- a/patches/server/0929-Treat-sequence-violations-like-they-should-be.patch +++ b/patches/server/0930-Treat-sequence-violations-like-they-should-be.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Treat sequence violations like they should be diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a352011eff0d7c29a349345ce7426ef4f22f404b..acc717c59ccab1102f3e12be67438998fcda6457 100644 +index bbb42a372d314621221688d8d5d6f418e45f4e08..f70ab11877ae04a4c9cc4ef61dc6e07c0f3fe9f2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2011,6 +2011,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0930-remove-duplicate-animate-packet-for-records.patch b/patches/server/0931-remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/0930-remove-duplicate-animate-packet-for-records.patch rename to patches/server/0931-remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/0931-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0932-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/server/0931-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/server/0932-Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/server/0932-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0933-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/0932-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0933-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/0933-Use-array-for-gamerule-storage.patch b/patches/server/0934-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0933-Use-array-for-gamerule-storage.patch rename to patches/server/0934-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0934-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0935-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0934-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0935-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0935-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0936-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0935-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0936-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0936-Add-Mob-Experience-reward-API.patch b/patches/server/0937-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0936-Add-Mob-Experience-reward-API.patch rename to patches/server/0937-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0937-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0938-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0937-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0938-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0938-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0939-Fix-DamageCause-for-Falling-Blocks.patch similarity index 100% rename from patches/server/0938-Fix-DamageCause-for-Falling-Blocks.patch rename to patches/server/0939-Fix-DamageCause-for-Falling-Blocks.patch diff --git a/patches/server/0939-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0940-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0939-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0940-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0940-More-accurate-isInOpenWater-impl.patch b/patches/server/0941-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0940-More-accurate-isInOpenWater-impl.patch rename to patches/server/0941-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0941-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0942-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/server/0941-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/server/0942-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/server/0942-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0943-Optimise-recalcBlockCounts-for-empty-sections.patch similarity index 100% rename from patches/server/0942-Optimise-recalcBlockCounts-for-empty-sections.patch rename to patches/server/0943-Optimise-recalcBlockCounts-for-empty-sections.patch diff --git a/patches/server/0943-Expand-PlayerItemMendEvent.patch b/patches/server/0944-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/server/0943-Expand-PlayerItemMendEvent.patch rename to patches/server/0944-Expand-PlayerItemMendEvent.patch diff --git a/patches/server/0944-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0945-Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/server/0944-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0945-Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/server/0945-Add-transient-modifier-API.patch b/patches/server/0946-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0945-Add-transient-modifier-API.patch rename to patches/server/0946-Add-transient-modifier-API.patch diff --git a/patches/server/0946-Fix-block-place-logic.patch b/patches/server/0947-Fix-block-place-logic.patch similarity index 100% rename from patches/server/0946-Fix-block-place-logic.patch rename to patches/server/0947-Fix-block-place-logic.patch diff --git a/patches/server/0947-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0948-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch similarity index 100% rename from patches/server/0947-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch rename to patches/server/0948-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch diff --git a/patches/server/0948-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0949-Ignore-inline-definitions-of-trim-material-pattern.patch similarity index 100% rename from patches/server/0948-Ignore-inline-definitions-of-trim-material-pattern.patch rename to patches/server/0949-Ignore-inline-definitions-of-trim-material-pattern.patch diff --git a/patches/server/0949-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0950-Call-BlockGrowEvent-for-missing-blocks.patch similarity index 100% rename from patches/server/0949-Call-BlockGrowEvent-for-missing-blocks.patch rename to patches/server/0950-Call-BlockGrowEvent-for-missing-blocks.patch diff --git a/patches/server/0950-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0951-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch similarity index 100% rename from patches/server/0950-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch rename to patches/server/0951-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch diff --git a/patches/server/0951-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0952-fix-MapLike-spam-for-missing-key-selector.patch similarity index 100% rename from patches/server/0951-fix-MapLike-spam-for-missing-key-selector.patch rename to patches/server/0952-fix-MapLike-spam-for-missing-key-selector.patch diff --git a/patches/server/0952-Fix-sniffer-removeExploredLocation.patch b/patches/server/0953-Fix-sniffer-removeExploredLocation.patch similarity index 100% rename from patches/server/0952-Fix-sniffer-removeExploredLocation.patch rename to patches/server/0953-Fix-sniffer-removeExploredLocation.patch diff --git a/patches/server/0953-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0954-Add-method-to-remove-all-active-potion-effects.patch similarity index 91% rename from patches/server/0953-Add-method-to-remove-all-active-potion-effects.patch rename to patches/server/0954-Add-method-to-remove-all-active-potion-effects.patch index c21ed94db8908..570cabfbfda7b 100644 --- a/patches/server/0953-Add-method-to-remove-all-active-potion-effects.patch +++ b/patches/server/0954-Add-method-to-remove-all-active-potion-effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index e997aebe36436570e2461a4685f0fb371ce4ce14..fe2124694eb080cab685a1ce1f6a66e2fcdf6a17 100644 +index bb5980b7e265860968bc86216f2f3ad47301830c..daadfec2d86f7957072a639e1e36d4082448f35f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -503,6 +503,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0954-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0955-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch similarity index 100% rename from patches/server/0954-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch rename to patches/server/0955-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch diff --git a/patches/server/0955-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0956-Fix-incorrect-crafting-result-amount-for-fireworks.patch similarity index 100% rename from patches/server/0955-Fix-incorrect-crafting-result-amount-for-fireworks.patch rename to patches/server/0956-Fix-incorrect-crafting-result-amount-for-fireworks.patch diff --git a/patches/server/0956-Properly-Cancel-Usable-Items.patch b/patches/server/0957-Properly-Cancel-Usable-Items.patch similarity index 100% rename from patches/server/0956-Properly-Cancel-Usable-Items.patch rename to patches/server/0957-Properly-Cancel-Usable-Items.patch diff --git a/patches/server/0957-Add-event-for-player-editing-sign.patch b/patches/server/0958-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/server/0957-Add-event-for-player-editing-sign.patch rename to patches/server/0958-Add-event-for-player-editing-sign.patch diff --git a/patches/server/0958-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0959-Only-tick-item-frames-if-players-can-see-it.patch similarity index 100% rename from patches/server/0958-Only-tick-item-frames-if-players-can-see-it.patch rename to patches/server/0959-Only-tick-item-frames-if-players-can-see-it.patch diff --git a/patches/server/0959-Improve-command-function-perm-level-checks.patch b/patches/server/0960-Improve-command-function-perm-level-checks.patch similarity index 100% rename from patches/server/0959-Improve-command-function-perm-level-checks.patch rename to patches/server/0960-Improve-command-function-perm-level-checks.patch diff --git a/patches/server/0960-Add-option-to-disable-block-updates.patch b/patches/server/0961-Add-option-to-disable-block-updates.patch similarity index 100% rename from patches/server/0960-Add-option-to-disable-block-updates.patch rename to patches/server/0961-Add-option-to-disable-block-updates.patch diff --git a/patches/server/0961-Call-missing-BlockDispenseEvent.patch b/patches/server/0962-Call-missing-BlockDispenseEvent.patch similarity index 100% rename from patches/server/0961-Call-missing-BlockDispenseEvent.patch rename to patches/server/0962-Call-missing-BlockDispenseEvent.patch diff --git a/patches/server/0962-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0963-Don-t-load-chunks-for-supporting-block-checks.patch similarity index 100% rename from patches/server/0962-Don-t-load-chunks-for-supporting-block-checks.patch rename to patches/server/0963-Don-t-load-chunks-for-supporting-block-checks.patch diff --git a/patches/server/0963-Optimize-player-lookups-for-beacons.patch b/patches/server/0964-Optimize-player-lookups-for-beacons.patch similarity index 100% rename from patches/server/0963-Optimize-player-lookups-for-beacons.patch rename to patches/server/0964-Optimize-player-lookups-for-beacons.patch diff --git a/patches/server/0964-Add-Sign-getInteractableSideFor.patch b/patches/server/0965-Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/server/0964-Add-Sign-getInteractableSideFor.patch rename to patches/server/0965-Add-Sign-getInteractableSideFor.patch diff --git a/patches/server/0965-Array-backed-synched-entity-data.patch b/patches/server/0966-Array-backed-synched-entity-data.patch similarity index 100% rename from patches/server/0965-Array-backed-synched-entity-data.patch rename to patches/server/0966-Array-backed-synched-entity-data.patch diff --git a/patches/server/0966-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0967-fix-item-meta-for-tadpole-buckets.patch similarity index 100% rename from patches/server/0966-fix-item-meta-for-tadpole-buckets.patch rename to patches/server/0967-fix-item-meta-for-tadpole-buckets.patch diff --git a/patches/server/0967-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0968-Suppress-Item-Meta-Validation-Checks.patch similarity index 100% rename from patches/server/0967-Suppress-Item-Meta-Validation-Checks.patch rename to patches/server/0968-Suppress-Item-Meta-Validation-Checks.patch diff --git a/patches/server/0968-Fix-BanList-API.patch b/patches/server/0969-Fix-BanList-API.patch similarity index 100% rename from patches/server/0968-Fix-BanList-API.patch rename to patches/server/0969-Fix-BanList-API.patch diff --git a/patches/server/0969-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0970-Determine-lava-and-water-fluid-explosion-resistance-.patch similarity index 100% rename from patches/server/0969-Determine-lava-and-water-fluid-explosion-resistance-.patch rename to patches/server/0970-Determine-lava-and-water-fluid-explosion-resistance-.patch diff --git a/patches/server/0970-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0971-Fix-possible-NPE-on-painting-creation.patch similarity index 100% rename from patches/server/0970-Fix-possible-NPE-on-painting-creation.patch rename to patches/server/0971-Fix-possible-NPE-on-painting-creation.patch diff --git a/patches/server/0971-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0972-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0971-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0972-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0972-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0973-ExperienceOrb-should-call-EntitySpawnEvent.patch similarity index 100% rename from patches/server/0972-ExperienceOrb-should-call-EntitySpawnEvent.patch rename to patches/server/0973-ExperienceOrb-should-call-EntitySpawnEvent.patch diff --git a/patches/server/0973-Don-t-tick-signs.patch b/patches/server/0974-Don-t-tick-signs.patch similarity index 100% rename from patches/server/0973-Don-t-tick-signs.patch rename to patches/server/0974-Don-t-tick-signs.patch diff --git a/patches/server/0974-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0975-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch similarity index 100% rename from patches/server/0974-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch rename to patches/server/0975-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch diff --git a/patches/server/0975-Add-whitelist-events.patch b/patches/server/0976-Add-whitelist-events.patch similarity index 100% rename from patches/server/0975-Add-whitelist-events.patch rename to patches/server/0976-Add-whitelist-events.patch diff --git a/patches/server/0976-Implement-PlayerFailMoveEvent.patch b/patches/server/0977-Implement-PlayerFailMoveEvent.patch similarity index 98% rename from patches/server/0976-Implement-PlayerFailMoveEvent.patch rename to patches/server/0977-Implement-PlayerFailMoveEvent.patch index 994712cea1e13..42ea3632009b5 100644 --- a/patches/server/0976-Implement-PlayerFailMoveEvent.patch +++ b/patches/server/0977-Implement-PlayerFailMoveEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerFailMoveEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1c86eaf44e6c797a51e69f14e08bb9a3f91b4c20..18a3546b829c8c696b6d38d2325a09d34c1da3a5 100644 +index 2af12e7dddf872f3b80d6288c0b1bd47fcd2b2f7..6e23c295f77e95564bf132a03397c4640bf9f49e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1291,8 +1291,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0977-Folia-scheduler-and-owned-region-API.patch b/patches/server/0978-Folia-scheduler-and-owned-region-API.patch similarity index 100% rename from patches/server/0977-Folia-scheduler-and-owned-region-API.patch rename to patches/server/0978-Folia-scheduler-and-owned-region-API.patch diff --git a/patches/server/0978-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0979-Only-erase-allay-memory-on-non-item-targets.patch similarity index 100% rename from patches/server/0978-Only-erase-allay-memory-on-non-item-targets.patch rename to patches/server/0979-Only-erase-allay-memory-on-non-item-targets.patch diff --git a/patches/server/0979-API-for-updating-recipes-on-clients.patch b/patches/server/0980-API-for-updating-recipes-on-clients.patch similarity index 100% rename from patches/server/0979-API-for-updating-recipes-on-clients.patch rename to patches/server/0980-API-for-updating-recipes-on-clients.patch diff --git a/patches/server/0980-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0981-Fix-rotation-when-spawning-display-entities.patch similarity index 100% rename from patches/server/0980-Fix-rotation-when-spawning-display-entities.patch rename to patches/server/0981-Fix-rotation-when-spawning-display-entities.patch diff --git a/patches/server/0981-Only-capture-actual-tree-growth.patch b/patches/server/0982-Only-capture-actual-tree-growth.patch similarity index 100% rename from patches/server/0981-Only-capture-actual-tree-growth.patch rename to patches/server/0982-Only-capture-actual-tree-growth.patch diff --git a/patches/server/0982-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0983-Use-correct-source-for-mushroom-block-spread-event.patch similarity index 100% rename from patches/server/0982-Use-correct-source-for-mushroom-block-spread-event.patch rename to patches/server/0983-Use-correct-source-for-mushroom-block-spread-event.patch diff --git a/patches/server/0983-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0984-Respect-randomizeData-on-more-entities-when-spawning.patch similarity index 100% rename from patches/server/0983-Respect-randomizeData-on-more-entities-when-spawning.patch rename to patches/server/0984-Respect-randomizeData-on-more-entities-when-spawning.patch diff --git a/patches/server/0984-Use-correct-seed-on-api-world-load.patch b/patches/server/0985-Use-correct-seed-on-api-world-load.patch similarity index 100% rename from patches/server/0984-Use-correct-seed-on-api-world-load.patch rename to patches/server/0985-Use-correct-seed-on-api-world-load.patch diff --git a/patches/server/0985-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0986-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch similarity index 100% rename from patches/server/0985-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch rename to patches/server/0986-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch diff --git a/patches/server/0986-Cache-map-ids-on-item-frames.patch b/patches/server/0987-Cache-map-ids-on-item-frames.patch similarity index 100% rename from patches/server/0986-Cache-map-ids-on-item-frames.patch rename to patches/server/0987-Cache-map-ids-on-item-frames.patch diff --git a/patches/server/0987-Fix-custom-statistic-criteria-creation.patch b/patches/server/0988-Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/server/0987-Fix-custom-statistic-criteria-creation.patch rename to patches/server/0988-Fix-custom-statistic-criteria-creation.patch diff --git a/patches/server/0988-Bandaid-fix-for-Effect.patch b/patches/server/0989-Bandaid-fix-for-Effect.patch similarity index 98% rename from patches/server/0988-Bandaid-fix-for-Effect.patch rename to patches/server/0989-Bandaid-fix-for-Effect.patch index ab9a86f3fbdb6..30fbe85e64556 100644 --- a/patches/server/0988-Bandaid-fix-for-Effect.patch +++ b/patches/server/0989-Bandaid-fix-for-Effect.patch @@ -45,7 +45,7 @@ index 5a5a8945c786e16ff0df62494ddd1ac85c42b53f..63f9735d356dafd579cee4423d3037eb case COMPOSTER_FILL_ATTEMPT: datavalue = ((Boolean) data) ? 1 : 0; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 3b2ad8aca2bec9a1ff828e3d25a726948fc6c3fa..27ea9f2616dca02f9ecdd7cb5cc815e0aa2d5eb4 100644 +index a54b8615b9652760eaa72b30dfa5460e77d4440a..4879b585df9a6488922511a8e6603964bd13abcf 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1374,7 +1374,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0989-SculkCatalyst-bloom-API.patch b/patches/server/0990-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/server/0989-SculkCatalyst-bloom-API.patch rename to patches/server/0990-SculkCatalyst-bloom-API.patch diff --git a/patches/server/0990-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0991-API-for-an-entity-s-scoreboard-name.patch similarity index 100% rename from patches/server/0990-API-for-an-entity-s-scoreboard-name.patch rename to patches/server/0991-API-for-an-entity-s-scoreboard-name.patch diff --git a/patches/server/0991-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0992-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch similarity index 98% rename from patches/server/0991-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch rename to patches/server/0992-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch index 584e55ee4a888..d97cd25ac6d9b 100644 --- a/patches/server/0991-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch +++ b/patches/server/0992-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch @@ -61,7 +61,7 @@ index dbedc73039f53ddf042999524eec62f032a20d5d..aaaf3a60696389b4e27a45de69743311 spawnercreature_d = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, null, true); } else { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 06b455632ce3fc495cd41a61ce5a8a9f06461b1d..cacf251db5d60583fe05f571d0fe7844c44900a1 100644 +index 76d513c61eec05edc8b037f2567562fb677f2d95..2919c0562b3cfa48912d81e8619883493da99a36 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -253,6 +253,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0992-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0993-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 100% rename from patches/server/0992-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/server/0993-Deprecate-and-replace-methods-with-old-StructureType.patch diff --git a/patches/server/0993-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0994-Don-t-tab-complete-namespaced-commands-if-send-names.patch similarity index 95% rename from patches/server/0993-Don-t-tab-complete-namespaced-commands-if-send-names.patch rename to patches/server/0994-Don-t-tab-complete-namespaced-commands-if-send-names.patch index d69eb30401476..2b8064b545828 100644 --- a/patches/server/0993-Don-t-tab-complete-namespaced-commands-if-send-names.patch +++ b/patches/server/0994-Don-t-tab-complete-namespaced-commands-if-send-names.patch @@ -11,7 +11,7 @@ This patch prevents server from sending namespaced commands when player requests tab-complete only commands. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 18a3546b829c8c696b6d38d2325a09d34c1da3a5..ec4add38ebf0329cdc8e8bbdb3bd76cac9948ffc 100644 +index 6e23c295f77e95564bf132a03397c4640bf9f49e..ffa4cee256c387b1ef8489b931cd3aefeaa6f9f4 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -805,6 +805,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0994-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0995-Properly-handle-BlockBreakEvent-isDropItems.patch similarity index 100% rename from patches/server/0994-Properly-handle-BlockBreakEvent-isDropItems.patch rename to patches/server/0995-Properly-handle-BlockBreakEvent-isDropItems.patch diff --git a/patches/server/0995-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0996-Fire-entity-death-event-for-ender-dragon.patch similarity index 100% rename from patches/server/0995-Fire-entity-death-event-for-ender-dragon.patch rename to patches/server/0996-Fire-entity-death-event-for-ender-dragon.patch diff --git a/patches/server/0996-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0997-Configurable-entity-tracking-range-by-Y-coordinate.patch similarity index 100% rename from patches/server/0996-Configurable-entity-tracking-range-by-Y-coordinate.patch rename to patches/server/0997-Configurable-entity-tracking-range-by-Y-coordinate.patch diff --git a/patches/server/0997-Add-Listing-API-for-Player.patch b/patches/server/0998-Add-Listing-API-for-Player.patch similarity index 100% rename from patches/server/0997-Add-Listing-API-for-Player.patch rename to patches/server/0998-Add-Listing-API-for-Player.patch diff --git a/patches/server/0998-Configurable-Region-Compression-Format.patch b/patches/server/0999-Configurable-Region-Compression-Format.patch similarity index 100% rename from patches/server/0998-Configurable-Region-Compression-Format.patch rename to patches/server/0999-Configurable-Region-Compression-Format.patch diff --git a/patches/server/0999-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/1000-Expose-clicked-BlockFace-during-BlockDamageEvent.patch similarity index 100% rename from patches/server/0999-Expose-clicked-BlockFace-during-BlockDamageEvent.patch rename to patches/server/1000-Expose-clicked-BlockFace-during-BlockDamageEvent.patch diff --git a/patches/server/1000-Fix-NPE-on-Boat-getStatus.patch b/patches/server/1001-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/server/1000-Fix-NPE-on-Boat-getStatus.patch rename to patches/server/1001-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/server/1001-Expand-Pose-API.patch b/patches/server/1002-Expand-Pose-API.patch similarity index 100% rename from patches/server/1001-Expand-Pose-API.patch rename to patches/server/1002-Expand-Pose-API.patch diff --git a/patches/server/1002-More-DragonBattle-API.patch b/patches/server/1003-More-DragonBattle-API.patch similarity index 100% rename from patches/server/1002-More-DragonBattle-API.patch rename to patches/server/1003-More-DragonBattle-API.patch diff --git a/patches/server/1003-Deep-clone-unhandled-nbt-tags.patch b/patches/server/1004-Deep-clone-unhandled-nbt-tags.patch similarity index 100% rename from patches/server/1003-Deep-clone-unhandled-nbt-tags.patch rename to patches/server/1004-Deep-clone-unhandled-nbt-tags.patch diff --git a/patches/server/1004-Add-PlayerPickItemEvent.patch b/patches/server/1005-Add-PlayerPickItemEvent.patch similarity index 96% rename from patches/server/1004-Add-PlayerPickItemEvent.patch rename to patches/server/1005-Add-PlayerPickItemEvent.patch index d7cd5f972ffb3..4c67972611330 100644 --- a/patches/server/1004-Add-PlayerPickItemEvent.patch +++ b/patches/server/1005-Add-PlayerPickItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerPickItemEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ec4add38ebf0329cdc8e8bbdb3bd76cac9948ffc..8bd243a8d5a4be54f907af2b02e96ea833cee62f 100644 +index ffa4cee256c387b1ef8489b931cd3aefeaa6f9f4..34fcdeb0f4039f1fc6c4c8c593cc615560af1ba2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -942,7 +942,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/1005-Improve-performance-of-mass-crafts.patch b/patches/server/1006-Improve-performance-of-mass-crafts.patch similarity index 100% rename from patches/server/1005-Improve-performance-of-mass-crafts.patch rename to patches/server/1006-Improve-performance-of-mass-crafts.patch diff --git a/patches/server/1006-Allow-trident-custom-damage.patch b/patches/server/1007-Allow-trident-custom-damage.patch similarity index 100% rename from patches/server/1006-Allow-trident-custom-damage.patch rename to patches/server/1007-Allow-trident-custom-damage.patch diff --git a/patches/server/1007-Expose-hand-during-BlockCanBuildEvent.patch b/patches/server/1008-Expose-hand-during-BlockCanBuildEvent.patch similarity index 100% rename from patches/server/1007-Expose-hand-during-BlockCanBuildEvent.patch rename to patches/server/1008-Expose-hand-during-BlockCanBuildEvent.patch diff --git a/patches/server/1008-Optimize-nearest-structure-border-iteration.patch b/patches/server/1009-Optimize-nearest-structure-border-iteration.patch similarity index 100% rename from patches/server/1008-Optimize-nearest-structure-border-iteration.patch rename to patches/server/1009-Optimize-nearest-structure-border-iteration.patch diff --git a/patches/server/1009-Implement-OfflinePlayer-isConnected.patch b/patches/server/1010-Implement-OfflinePlayer-isConnected.patch similarity index 100% rename from patches/server/1009-Implement-OfflinePlayer-isConnected.patch rename to patches/server/1010-Implement-OfflinePlayer-isConnected.patch diff --git a/patches/server/1010-Fix-inventory-desync.patch b/patches/server/1011-Fix-inventory-desync.patch similarity index 100% rename from patches/server/1010-Fix-inventory-desync.patch rename to patches/server/1011-Fix-inventory-desync.patch diff --git a/patches/server/1011-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/1012-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/server/1011-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/server/1012-Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/server/1012-Configure-sniffer-egg-hatch-time.patch b/patches/server/1013-Configure-sniffer-egg-hatch-time.patch similarity index 100% rename from patches/server/1012-Configure-sniffer-egg-hatch-time.patch rename to patches/server/1013-Configure-sniffer-egg-hatch-time.patch diff --git a/patches/server/1013-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/1014-Do-crystal-portal-proximity-check-before-entity-look.patch similarity index 100% rename from patches/server/1013-Do-crystal-portal-proximity-check-before-entity-look.patch rename to patches/server/1014-Do-crystal-portal-proximity-check-before-entity-look.patch diff --git a/patches/server/1014-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/1015-Skip-POI-finding-if-stuck-in-vehicle.patch similarity index 100% rename from patches/server/1014-Skip-POI-finding-if-stuck-in-vehicle.patch rename to patches/server/1015-Skip-POI-finding-if-stuck-in-vehicle.patch diff --git a/patches/server/1015-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/1016-Add-slot-sanity-checks-in-container-clicks.patch similarity index 100% rename from patches/server/1015-Add-slot-sanity-checks-in-container-clicks.patch rename to patches/server/1016-Add-slot-sanity-checks-in-container-clicks.patch diff --git a/patches/server/1016-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/1017-Call-BlockRedstoneEvents-for-lecterns.patch similarity index 100% rename from patches/server/1016-Call-BlockRedstoneEvents-for-lecterns.patch rename to patches/server/1017-Call-BlockRedstoneEvents-for-lecterns.patch diff --git a/patches/server/1017-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/1018-Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/server/1017-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/server/1018-Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/server/1018-Fix-silent-equipment-change-for-mobs.patch b/patches/server/1019-Fix-silent-equipment-change-for-mobs.patch similarity index 100% rename from patches/server/1018-Fix-silent-equipment-change-for-mobs.patch rename to patches/server/1019-Fix-silent-equipment-change-for-mobs.patch diff --git a/patches/server/1019-Fix-spigot-s-Forced-Stats.patch b/patches/server/1020-Fix-spigot-s-Forced-Stats.patch similarity index 100% rename from patches/server/1019-Fix-spigot-s-Forced-Stats.patch rename to patches/server/1020-Fix-spigot-s-Forced-Stats.patch diff --git a/patches/server/1020-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/1021-Add-missing-InventoryHolders-to-inventories.patch similarity index 100% rename from patches/server/1020-Add-missing-InventoryHolders-to-inventories.patch rename to patches/server/1021-Add-missing-InventoryHolders-to-inventories.patch diff --git a/patches/server/1021-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/1022-Do-not-read-tile-entities-in-chunks-that-are-positio.patch similarity index 100% rename from patches/server/1021-Do-not-read-tile-entities-in-chunks-that-are-positio.patch rename to patches/server/1022-Do-not-read-tile-entities-in-chunks-that-are-positio.patch diff --git a/patches/server/1022-Actually-optimise-explosions.patch b/patches/server/1023-Actually-optimise-explosions.patch similarity index 100% rename from patches/server/1022-Actually-optimise-explosions.patch rename to patches/server/1023-Actually-optimise-explosions.patch diff --git a/patches/server/1023-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/1024-Add-missing-logs-for-log-ips-config-option.patch similarity index 100% rename from patches/server/1023-Add-missing-logs-for-log-ips-config-option.patch rename to patches/server/1024-Add-missing-logs-for-log-ips-config-option.patch diff --git a/patches/server/1024-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/1025-Remove-Spigot-Bug-Fix-for-MC-109346.patch similarity index 100% rename from patches/server/1024-Remove-Spigot-Bug-Fix-for-MC-109346.patch rename to patches/server/1025-Remove-Spigot-Bug-Fix-for-MC-109346.patch diff --git a/patches/server/1025-Fix-SuspiciousStewMeta.patch b/patches/server/1026-Fix-SuspiciousStewMeta.patch similarity index 100% rename from patches/server/1025-Fix-SuspiciousStewMeta.patch rename to patches/server/1026-Fix-SuspiciousStewMeta.patch diff --git a/patches/server/1026-Optimise-chunk-tick-iteration.patch b/patches/server/1027-Optimise-chunk-tick-iteration.patch similarity index 99% rename from patches/server/1026-Optimise-chunk-tick-iteration.patch rename to patches/server/1027-Optimise-chunk-tick-iteration.patch index 8a2ed1ca152dd..1e485d1651989 100644 --- a/patches/server/1026-Optimise-chunk-tick-iteration.patch +++ b/patches/server/1027-Optimise-chunk-tick-iteration.patch @@ -359,7 +359,7 @@ index aaaf3a60696389b4e27a45de69743311c58e5829..17b6925b46f8386dcfc561483693de51 gameprofilerfiller.pop(); this.chunkMap.tick(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 5d32ce8112562f368e6ebea064181622b22823ed..76157319b79d7fefe38cb2cc10b2d79c12667e3d 100644 +index ccc2ec523ea6b85ffefb2ae8e27d621499735997..ba972d1661426d7e30f6f61bad3b9608e66ea721 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -318,6 +318,9 @@ public class ServerPlayer extends Player { diff --git a/patches/server/1027-Lag-compensation-ticks.patch b/patches/server/1028-Lag-compensation-ticks.patch similarity index 100% rename from patches/server/1027-Lag-compensation-ticks.patch rename to patches/server/1028-Lag-compensation-ticks.patch diff --git a/patches/server/1028-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/1029-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch similarity index 100% rename from patches/server/1028-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch rename to patches/server/1029-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch diff --git a/patches/server/1029-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/1030-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch similarity index 100% rename from patches/server/1029-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch rename to patches/server/1030-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch diff --git a/patches/server/1030-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/1031-Fix-team-sidebar-objectives-not-being-cleared.patch similarity index 100% rename from patches/server/1030-Fix-team-sidebar-objectives-not-being-cleared.patch rename to patches/server/1031-Fix-team-sidebar-objectives-not-being-cleared.patch diff --git a/patches/server/1031-Optimise-nearby-player-retrieval.patch b/patches/server/1032-Optimise-nearby-player-retrieval.patch similarity index 100% rename from patches/server/1031-Optimise-nearby-player-retrieval.patch rename to patches/server/1032-Optimise-nearby-player-retrieval.patch diff --git a/patches/server/1032-Remove-streams-for-villager-AI.patch b/patches/server/1033-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/1032-Remove-streams-for-villager-AI.patch rename to patches/server/1033-Remove-streams-for-villager-AI.patch diff --git a/patches/server/1033-Fix-missing-map-initialize-event-call.patch b/patches/server/1034-Fix-missing-map-initialize-event-call.patch similarity index 100% rename from patches/server/1033-Fix-missing-map-initialize-event-call.patch rename to patches/server/1034-Fix-missing-map-initialize-event-call.patch diff --git a/patches/server/1034-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/1035-Update-entity-data-when-attaching-firework-to-entity.patch similarity index 100% rename from patches/server/1034-Update-entity-data-when-attaching-firework-to-entity.patch rename to patches/server/1035-Update-entity-data-when-attaching-firework-to-entity.patch diff --git a/patches/server/1035-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/1036-Use-correct-variable-for-initializing-CraftLootTable.patch similarity index 100% rename from patches/server/1035-Use-correct-variable-for-initializing-CraftLootTable.patch rename to patches/server/1036-Use-correct-variable-for-initializing-CraftLootTable.patch diff --git a/patches/server/1036-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/1037-Make-setVelocity-method-of-Fireballs-change-the-trav.patch similarity index 100% rename from patches/server/1036-Make-setVelocity-method-of-Fireballs-change-the-trav.patch rename to patches/server/1037-Make-setVelocity-method-of-Fireballs-change-the-trav.patch diff --git a/patches/server/1037-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/1038-Fix-UnsafeValues-loadAdvancement.patch similarity index 100% rename from patches/server/1037-Fix-UnsafeValues-loadAdvancement.patch rename to patches/server/1038-Fix-UnsafeValues-loadAdvancement.patch diff --git a/patches/server/1038-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/1040-Don-t-check-if-we-can-see-non-visible-entities.patch similarity index 90% rename from patches/server/1038-Don-t-check-if-we-can-see-non-visible-entities.patch rename to patches/server/1040-Don-t-check-if-we-can-see-non-visible-entities.patch index c387d4170e990..1fd4d033479fd 100644 --- a/patches/server/1038-Don-t-check-if-we-can-see-non-visible-entities.patch +++ b/patches/server/1040-Don-t-check-if-we-can-see-non-visible-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't check if we can see non-visible entities diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 0c2617574e21037d94ac56ad08b490f9bca5c5af..28c6ec04750daca3d77a0cee2b9f17f2508662cc 100644 +index f64d70b6fce985e55a051fcf3b005c1551f3ebe5..6a49a36f64521f0bddcf21585ee507040119fd6d 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1302,7 +1302,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/1040-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/1041-Fix-NPE-in-SculkBloomEvent-world-access.patch similarity index 100% rename from patches/server/1040-Fix-NPE-in-SculkBloomEvent-world-access.patch rename to patches/server/1041-Fix-NPE-in-SculkBloomEvent-world-access.patch diff --git a/patches/server/1041-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/1042-Allow-null-itemstack-for-Player-sendEquipmentChange.patch similarity index 100% rename from patches/server/1041-Allow-null-itemstack-for-Player-sendEquipmentChange.patch rename to patches/server/1042-Allow-null-itemstack-for-Player-sendEquipmentChange.patch diff --git a/patches/server/1042-Optimize-VarInts.patch b/patches/server/1043-Optimize-VarInts.patch similarity index 100% rename from patches/server/1042-Optimize-VarInts.patch rename to patches/server/1043-Optimize-VarInts.patch diff --git a/patches/server/1043-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch b/patches/server/1044-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch similarity index 100% rename from patches/server/1043-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch rename to patches/server/1044-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch