Paper/patches/server/0676-Multi-Block-Change-API-Implementation.patch

63 lines
3.7 KiB
Diff
Raw Normal View History

2022-01-20 18:50:50 +01:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Brody Beckwith <brody@beckwith.dev>
Date: Fri, 14 Jan 2022 00:41:11 -0500
Subject: [PATCH] Multi Block Change API Implementation
diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSectionBlocksUpdatePacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSectionBlocksUpdatePacket.java
2024-04-24 19:59:51 +02:00
index 926ff9be3d9e3f5d620e4c7ccb22b9f64865ff8c..1a37654aff9a9c86c9f7af10a1cf721371f0c5ec 100644
2022-01-20 18:50:50 +01:00
--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSectionBlocksUpdatePacket.java
+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSectionBlocksUpdatePacket.java
2024-04-24 19:59:51 +02:00
@@ -62,6 +62,14 @@ public class ClientboundSectionBlocksUpdatePacket implements Packet<ClientGamePa
2022-01-20 18:50:50 +01:00
}
+ // Paper start - Multi Block Change API
2023-06-08 22:56:13 +02:00
+ public ClientboundSectionBlocksUpdatePacket(SectionPos sectionPos, it.unimi.dsi.fastutil.shorts.Short2ObjectMap<BlockState> blockChanges) {
2022-01-20 18:50:50 +01:00
+ this.sectionPos = sectionPos;
+ this.positions = blockChanges.keySet().toShortArray();
+ this.states = blockChanges.values().toArray(new BlockState[0]);
+ }
+ // Paper end - Multi Block Change API
2022-01-20 18:50:50 +01:00
+
2024-04-24 19:59:51 +02:00
private void write(FriendlyByteBuf buf) {
2022-01-20 18:50:50 +01:00
buf.writeLong(this.sectionPos.asLong());
2024-04-24 19:59:51 +02:00
buf.writeVarInt(this.positions.length);
2022-01-20 18:50:50 +01:00
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2024-04-25 22:47:32 +02:00
index 60147478bc40bc03a1622895074cf910ef6b94f4..ea3d87b425360b753af4ac7647ab296dc7a2faf0 100644
2022-01-20 18:50:50 +01:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2024-04-24 19:59:51 +02:00
@@ -927,6 +927,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2022-01-20 18:50:50 +01:00
this.getHandle().connection.send(packet);
}
+ // Paper start
+ @Override
2023-06-08 22:56:13 +02:00
+ public void sendMultiBlockChange(final Map<? extends io.papermc.paper.math.Position, BlockData> blockChanges) {
2022-01-20 18:50:50 +01:00
+ if (this.getHandle().connection == null) return;
+
+ Map<SectionPos, it.unimi.dsi.fastutil.shorts.Short2ObjectMap<net.minecraft.world.level.block.state.BlockState>> sectionMap = new HashMap<>();
+
+ for (Map.Entry<? extends io.papermc.paper.math.Position, BlockData> entry : blockChanges.entrySet()) {
2022-01-20 18:50:50 +01:00
+ BlockData blockData = entry.getValue();
+ BlockPos blockPos = io.papermc.paper.util.MCUtil.toBlockPos(entry.getKey());
2022-01-20 18:50:50 +01:00
+ SectionPos sectionPos = SectionPos.of(blockPos);
+
+ it.unimi.dsi.fastutil.shorts.Short2ObjectMap<net.minecraft.world.level.block.state.BlockState> sectionData = sectionMap.computeIfAbsent(sectionPos, key -> new it.unimi.dsi.fastutil.shorts.Short2ObjectArrayMap<>());
+ sectionData.put(SectionPos.sectionRelativePos(blockPos), ((CraftBlockData) blockData).getState());
+ }
+
+ for (Map.Entry<SectionPos, it.unimi.dsi.fastutil.shorts.Short2ObjectMap<net.minecraft.world.level.block.state.BlockState>> entry : sectionMap.entrySet()) {
+ SectionPos sectionPos = entry.getKey();
+ it.unimi.dsi.fastutil.shorts.Short2ObjectMap<net.minecraft.world.level.block.state.BlockState> blockData = entry.getValue();
+
2023-06-08 22:56:13 +02:00
+ net.minecraft.network.protocol.game.ClientboundSectionBlocksUpdatePacket packet = new net.minecraft.network.protocol.game.ClientboundSectionBlocksUpdatePacket(sectionPos, blockData);
2022-01-20 18:50:50 +01:00
+ this.getHandle().connection.send(packet);
+ }
+ }
+ // Paper end
+
@Override
2023-06-08 10:08:08 +02:00
public void sendBlockChanges(Collection<BlockState> blocks) {
Preconditions.checkArgument(blocks != null, "blocks must not be null");