Move CraftBukkit per-file patches

By: Initial <noreply+automated@papermc.io>

paper-server/patches/sources/net/minecraft/network/protocol/PlayerConnectionUtils.patch

@@ -0,0 +1,22 @@
+--- a/net/minecraft/network/protocol/PlayerConnectionUtils.java
++++ b/net/minecraft/network/protocol/PlayerConnectionUtils.java
+@@ -11,6 +11,11 @@
+ import net.minecraft.util.thread.IAsyncTaskHandler;
+ import org.slf4j.Logger;
+ 
++// CraftBukkit start
++import net.minecraft.server.MinecraftServer;
++import net.minecraft.server.network.ServerCommonPacketListenerImpl;
++// CraftBukkit end
++
+ public class PlayerConnectionUtils {
+ 
+     private static final Logger LOGGER = LogUtils.getLogger();
+@@ -24,6 +29,7 @@
+     public static <T extends PacketListener> void ensureRunningOnSameThread(Packet<T> packet, T t0, IAsyncTaskHandler<?> iasynctaskhandler) throws CancelledPacketHandleException {
+         if (!iasynctaskhandler.isSameThread()) {
+             iasynctaskhandler.executeIfPossible(() -> {
++                if (t0 instanceof ServerCommonPacketListenerImpl serverCommonPacketListener && serverCommonPacketListener.processedDisconnect) return; // CraftBukkit - Don't handle sync packets for kicked players
+                 if (t0.shouldHandleMessage(packet)) {
+                     try {
+                         packet.handle(t0);

paper-server/patches/sources/net/minecraft/network/protocol/common/ServerboundCustomPayloadPacket.patch

@@ -0,0 +1,12 @@
+--- a/net/minecraft/network/protocol/common/ServerboundCustomPayloadPacket.java
++++ b/net/minecraft/network/protocol/common/ServerboundCustomPayloadPacket.java
+@@ -16,8 +16,7 @@
+     private static final int MAX_PAYLOAD_SIZE = 32767;
+     public static final StreamCodec<PacketDataSerializer, ServerboundCustomPayloadPacket> STREAM_CODEC = CustomPacketPayload.codec((minecraftkey) -> {
+         return DiscardedPayload.codec(minecraftkey, 32767);
+-    }, (List) SystemUtils.make(Lists.newArrayList(new CustomPacketPayload.c[]{new CustomPacketPayload.c<>(BrandPayload.TYPE, BrandPayload.STREAM_CODEC)}), (arraylist) -> {
+-    })).map(ServerboundCustomPayloadPacket::new, ServerboundCustomPayloadPacket::payload);
++    }, java.util.Collections.emptyList()).map(ServerboundCustomPayloadPacket::new, ServerboundCustomPayloadPacket::payload); // CraftBukkit - treat all packets the same
+ 
+     @Override
+     public PacketType<ServerboundCustomPayloadPacket> type() {

paper-server/patches/sources/net/minecraft/network/protocol/common/custom/DiscardedPayload.patch

@@ -0,0 +1,24 @@
+--- a/net/minecraft/network/protocol/common/custom/DiscardedPayload.java
++++ b/net/minecraft/network/protocol/common/custom/DiscardedPayload.java
+@@ -4,16 +4,18 @@
+ import net.minecraft.network.codec.StreamCodec;
+ import net.minecraft.resources.MinecraftKey;
+ 
+-public record DiscardedPayload(MinecraftKey id) implements CustomPacketPayload {
++public record DiscardedPayload(MinecraftKey id, io.netty.buffer.ByteBuf data) implements CustomPacketPayload { // CraftBukkit - store data
+ 
+     public static <T extends PacketDataSerializer> StreamCodec<T, DiscardedPayload> codec(MinecraftKey minecraftkey, int i) {
+         return CustomPacketPayload.codec((discardedpayload, packetdataserializer) -> {
++            packetdataserializer.writeBytes(discardedpayload.data); // CraftBukkit - serialize
+         }, (packetdataserializer) -> {
+             int j = packetdataserializer.readableBytes();
+ 
+             if (j >= 0 && j <= i) {
+-                packetdataserializer.skipBytes(j);
+-                return new DiscardedPayload(minecraftkey);
++                // CraftBukkit start
++                return new DiscardedPayload(minecraftkey, packetdataserializer.readBytes(j));
++                // CraftBukkit end
+             } else {
+                 throw new IllegalArgumentException("Payload may not be larger than " + i + " bytes");
+             }

paper-server/patches/sources/net/minecraft/network/protocol/game/ClientboundInitializeBorderPacket.patch

@@ -0,0 +1,15 @@
+--- a/net/minecraft/network/protocol/game/ClientboundInitializeBorderPacket.java
++++ b/net/minecraft/network/protocol/game/ClientboundInitializeBorderPacket.java
+@@ -30,8 +30,10 @@
+     }
+ 
+     public ClientboundInitializeBorderPacket(WorldBorder worldborder) {
+-        this.newCenterX = worldborder.getCenterX();
+-        this.newCenterZ = worldborder.getCenterZ();
++        // CraftBukkit start - multiply out nether border
++        this.newCenterX = worldborder.getCenterX() * worldborder.world.dimensionType().coordinateScale();
++        this.newCenterZ = worldborder.getCenterZ() * worldborder.world.dimensionType().coordinateScale();
++        // CraftBukkit end
+         this.oldSize = worldborder.getSize();
+         this.newSize = worldborder.getLerpTarget();
+         this.lerpTime = worldborder.getLerpRemainingTime();

paper-server/patches/sources/net/minecraft/network/protocol/game/ClientboundSetBorderCenterPacket.patch

@@ -0,0 +1,15 @@
+--- a/net/minecraft/network/protocol/game/ClientboundSetBorderCenterPacket.java
++++ b/net/minecraft/network/protocol/game/ClientboundSetBorderCenterPacket.java
+@@ -13,8 +13,10 @@
+     private final double newCenterZ;
+ 
+     public ClientboundSetBorderCenterPacket(WorldBorder worldborder) {
+-        this.newCenterX = worldborder.getCenterX();
+-        this.newCenterZ = worldborder.getCenterZ();
++        // CraftBukkit start - multiply out nether border
++        this.newCenterX = worldborder.getCenterX() * (worldborder.world != null ? worldborder.world.dimensionType().coordinateScale() : 1.0);
++        this.newCenterZ = worldborder.getCenterZ() * (worldborder.world != null ? worldborder.world.dimensionType().coordinateScale() : 1.0);
++        // CraftBukkit end
+     }
+ 
+     private ClientboundSetBorderCenterPacket(PacketDataSerializer packetdataserializer) {

paper-server/patches/sources/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.patch

@@ -0,0 +1,7 @@
+--- a/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java
++++ b/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java
+@@ -1,3 +1,4 @@
++// mc-dev import
+ package net.minecraft.network.protocol.game;
+ 
+ import net.minecraft.network.RegistryFriendlyByteBuf;

paper-server/patches/sources/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.patch

@@ -0,0 +1,7 @@
+--- a/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.java
++++ b/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.java
+@@ -1,3 +1,4 @@
++// mc-dev import
+ package net.minecraft.network.protocol.game;
+ 
+ import net.minecraft.network.PacketDataSerializer;

paper-server/patches/sources/net/minecraft/network/protocol/game/PacketPlayInUseItem.patch

@@ -0,0 +1,7 @@
+--- a/net/minecraft/network/protocol/game/PacketPlayInUseItem.java
++++ b/net/minecraft/network/protocol/game/PacketPlayInUseItem.java
+@@ -1,3 +1,4 @@
++// mc-dev import
+ package net.minecraft.network.protocol.game;
+ 
+ import net.minecraft.network.PacketDataSerializer;

paper-server/patches/sources/net/minecraft/network/protocol/game/PacketPlayOutMultiBlockChange.patch

@@ -0,0 +1,23 @@
+--- a/net/minecraft/network/protocol/game/PacketPlayOutMultiBlockChange.java
++++ b/net/minecraft/network/protocol/game/PacketPlayOutMultiBlockChange.java
+@@ -33,11 +33,19 @@
+             short short0 = (Short) shortiterator.next();
+ 
+             this.positions[j] = short0;
+-            this.states[j] = chunksection.getBlockState(SectionPosition.sectionRelativeX(short0), SectionPosition.sectionRelativeY(short0), SectionPosition.sectionRelativeZ(short0));
++            this.states[j] = (chunksection != null) ? chunksection.getBlockState(SectionPosition.sectionRelativeX(short0), SectionPosition.sectionRelativeY(short0), SectionPosition.sectionRelativeZ(short0)) : net.minecraft.world.level.block.Blocks.AIR.defaultBlockState(); // CraftBukkit - SPIGOT-6076, Mojang bug when empty chunk section notified
+         }
+ 
+     }
+ 
++    // CraftBukkit start - Add constructor
++    public PacketPlayOutMultiBlockChange(SectionPosition sectionposition, ShortSet shortset, IBlockData[] states) {
++        this.sectionPos = sectionposition;
++        this.positions = shortset.toShortArray();
++        this.states = states;
++    }
++    // CraftBukkit end
++
+     private PacketPlayOutMultiBlockChange(PacketDataSerializer packetdataserializer) {
+         this.sectionPos = SectionPosition.of(packetdataserializer.readLong());
+         int i = packetdataserializer.readVarInt();

paper-server/patches/sources/net/minecraft/network/protocol/handshake/PacketHandshakingInSetProtocol.patch

@@ -0,0 +1,7 @@
+--- a/net/minecraft/network/protocol/handshake/PacketHandshakingInSetProtocol.java
++++ b/net/minecraft/network/protocol/handshake/PacketHandshakingInSetProtocol.java
+@@ -1,3 +1,4 @@
++// mc-dev import
+ package net.minecraft.network.protocol.handshake;
+ 
+ import net.minecraft.network.PacketDataSerializer;