From d7fb2077ee65b161917b948145cb92dcbc8b3562 Mon Sep 17 00:00:00 2001 From: lexikiq Date: Mon, 19 Jul 2021 03:40:44 -0400 Subject: [PATCH] Fix light blocks in canPlaceItemOn --- patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch b/patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch index 7864f31..f4a4a1a 100644 --- a/patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch +++ b/patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add UnsafeValues#canPlaceItemOn diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 7a8db8d481e9487ea83a640af208242f4987ad28..ce69a4dd36e17da1d90ba9a6f1059bff027d7b75 100644 +index 7a8db8d481e9487ea83a640af208242f4987ad28..dd7feb07e210ef64b5823cf9829b5f30cd0940a9 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -512,6 +512,55 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -20,7 +20,7 @@ index 7a8db8d481e9487ea83a640af208242f4987ad28..ce69a4dd36e17da1d90ba9a6f1059bff + org.apache.commons.lang3.Validate.notNull(face, "face"); + org.bukkit.entity.HumanEntity human = player == null ? null : player.getPlayer(); + java.util.concurrent.CompletableFuture future = new java.util.concurrent.CompletableFuture<>(); -+ if (block.getType().isEmpty() || block.isLiquid()) { ++ if (block.getType().isEmpty() || block.isLiquid() || (block.getType() == Material.LIGHT && item.getType() != Material.LIGHT)) { + future.complete(false); + return future; + } else if (!face.isCartesian()) {