From 472f5901899fc334ed88346b609ff90fe27c746b Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Sun, 13 Jun 2021 08:27:57 +1000 Subject: [PATCH] Add additional validation to Player#breakBlock By: md_5 --- .../main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 947075b50e..2831c4c73e 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -536,6 +536,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public boolean breakBlock(Block block) { + Preconditions.checkArgument(block != null, "Block cannot be null"); + Preconditions.checkArgument(block.getWorld().equals(getWorld()), "Cannot break blocks across worlds"); + return getHandle().gameMode.breakBlock(new BlockPosition(block.getX(), block.getY(), block.getZ())); }