From 701b06494ddf4a807788f159fe5aa7e63dff7a42 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Jun 2017 17:39:03 +1000 Subject: SPIGOT-3286: Call BlockFormEvent for Concrete Powder -> Concrete --- src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java index 1c0dc7d6..be0f46f9 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1041,9 +1041,10 @@ public class CraftEventFactory { return event; } - public static boolean handleBlockFormEvent(World world, BlockPosition pos, net.minecraft.server.Block block, @Nullable Entity entity) { + public static boolean handleBlockFormEvent(World world, BlockPosition pos, IBlockData block, @Nullable Entity entity) { BlockState blockState = world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()).getState(); - blockState.setType(CraftMagicNumbers.getMaterial(block)); + blockState.setType(CraftMagicNumbers.getMaterial(block.getBlock())); + blockState.setRawData((byte) block.getBlock().toLegacyData(block)); BlockFormEvent event = (entity == null) ? new BlockFormEvent(blockState.getBlock(), blockState) : new EntityBlockFormEvent(entity.getBukkitEntity(), blockState.getBlock(), blockState); world.getServer().getPluginManager().callEvent(event); -- cgit v1.2.3