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-01-18 22:00:40 +01:00
|
|
|
index f96d61bdeb556665d6e6e5023f9d77fd82204e89..ccdc2345465313991f065e1176b58fb7d5e8722f 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
|
2023-06-08 22:56:13 +02:00
|
|
|
@@ -59,6 +59,14 @@ public class ClientboundSectionBlocksUpdatePacket implements Packet<ClientGamePa
|
2022-01-20 18:50:50 +01:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2024-01-18 22:00:40 +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]);
|
|
|
|
+ }
|
2024-01-18 22:00:40 +01:00
|
|
|
+ // Paper end - Multi Block Change API
|
2022-01-20 18:50:50 +01:00
|
|
|
+
|
|
|
|
@Override
|
|
|
|
public void write(FriendlyByteBuf buf) {
|
|
|
|
buf.writeLong(this.sectionPos.asLong());
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2024-01-06 15:07:59 +01:00
|
|
|
index cb72755c1b1e04797dbe99612d7bdd0bfd4b540e..9d12fab078c0625844b5f07b884b5f5978bf590c 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
|
Updated Upstream (Bukkit/CraftBukkit) (#10034)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
f29cb801 Separate checkstyle-suppressions file is not required
86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API
d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor
b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack
9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode()
994a6163 Attempt upgrade of resolver libraries
CraftBukkit Changes:
b3b43a6ad Add Checkstyle check for unused imports
13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names
3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API
2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor
1dbdbbed4 PR-1238: Remove unnecessary sign ticking
659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper
e37e29ce0 Increase outdated build delay
c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack
492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode()
e11fbb9d7 Upgrade MySQL driver
9f3a0bd2a Attempt upgrade of resolver libraries
60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion
Spigot Changes:
06d602e7 Rebuild patches
2023-12-17 03:09:28 +01:00
|
|
|
@@ -886,6 +886,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<>();
|
|
|
|
+
|
2023-04-07 20:39:13 +02:00
|
|
|
+ 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();
|
2023-04-07 20:39:13 +02:00
|
|
|
+ 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) {
|
2022-09-24 03:38:12 +02:00
|
|
|
Preconditions.checkArgument(blocks != null, "blocks must not be null");
|