From f06ba41f913d19eec3e8974dcc85f4ed689d02a5 Mon Sep 17 00:00:00 2001 From: Maddy Miller Date: Mon, 9 Aug 2021 01:23:44 +1000 Subject: [PATCH] Fix Cycler tool not using full block data (#1868) (cherry picked from commit 8ee45137aa5d7a3b80b661601ab14e48f13756ec) --- .../com/sk89q/worldedit/command/tool/BlockDataCyler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java index da428c0ad..b9a2ee888 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java @@ -34,7 +34,7 @@ import com.sk89q.worldedit.util.Direction; import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.formatting.text.TextComponent; import com.sk89q.worldedit.world.World; -import com.sk89q.worldedit.world.block.BlockState; +import com.sk89q.worldedit.world.block.BaseBlock; import javax.annotation.Nullable; import java.util.HashMap; @@ -62,7 +62,7 @@ public class BlockDataCyler implements DoubleActionBlockTool { World world = (World) clicked.getExtent(); BlockVector3 blockPoint = clicked.toVector().toBlockPoint(); - BlockState block = world.getBlock(blockPoint); + BaseBlock block = world.getFullBlock(blockPoint); if (!config.allowedDataCycleBlocks.isEmpty() && !player.hasPermission("worldedit.override.data-cycler") @@ -87,7 +87,7 @@ public class BlockDataCyler implements DoubleActionBlockTool { index = (index + 1) % currentProperty.getValues().size(); @SuppressWarnings("unchecked") Property objProp = (Property) currentProperty; - BlockState newBlock = block.with(objProp, currentProperty.getValues().get(index)); + BaseBlock newBlock = block.with(objProp, currentProperty.getValues().get(index)); try (EditSession editSession = session.createEditSession(player)) { try {