From 87f8c7ca9b50769a6bbcadcf197c339921e64bce Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sat, 15 Jun 2024 08:05:21 -0700 Subject: [PATCH] Fix Player#sendBlockState (#10855) --- .../server/Fix-Player-setBlockUpdate.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 patches/server/Fix-Player-setBlockUpdate.patch diff --git a/patches/server/Fix-Player-setBlockUpdate.patch b/patches/server/Fix-Player-setBlockUpdate.patch new file mode 100644 index 0000000000..02a6d95d81 --- /dev/null +++ b/patches/server/Fix-Player-setBlockUpdate.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic +Date: Tue, 4 Jun 2024 19:48:03 -0700 +Subject: [PATCH] Fix Player#setBlockUpdate + +BlockEntity needs its Level set + +diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java ++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +@@ -0,0 +0,0 @@ public abstract class CraftBlockEntityState extends Craft + @Nullable + public Packet getUpdatePacket(@NotNull Location location) { + T vanillaTileEntitiy = (T) BlockEntity.loadStatic(CraftLocation.toBlockPosition(location), this.getHandle(), this.getSnapshotNBT(), this.getRegistryAccess()); ++ vanillaTileEntitiy.setLevel(((org.bukkit.craftbukkit.CraftWorld) location.getWorld()).getHandle()); // Paper - set level. Required for accessing RegistryAccess + return ClientboundBlockEntityDataPacket.create(vanillaTileEntitiy); + } + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + public void sendBlockUpdate(@NotNull Location location, @NotNull TileState tileState) throws IllegalArgumentException { + Preconditions.checkArgument(location != null, "Location can not be null"); + Preconditions.checkArgument(tileState != null, "TileState can not be null"); ++ Preconditions.checkArgument(location.getWorld() != null, "Location must have a world"); // Paper + + if (this.getHandle().connection == null) return; +