summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2017-06-03 17:39:03 +1000
committermd_5 <git@md-5.net>2017-06-03 17:39:03 +1000
commit701b06494ddf4a807788f159fe5aa7e63dff7a42 (patch)
tree8600577d8bd0d3c96034f8c6846e6579f1c81e0d /src
parent921ba53556066ee16cb212e564ee9403fb6a73ff (diff)
downloadcraftbukkit-701b06494ddf4a807788f159fe5aa7e63dff7a42.tar
craftbukkit-701b06494ddf4a807788f159fe5aa7e63dff7a42.tar.gz
craftbukkit-701b06494ddf4a807788f159fe5aa7e63dff7a42.tar.lz
craftbukkit-701b06494ddf4a807788f159fe5aa7e63dff7a42.tar.xz
craftbukkit-701b06494ddf4a807788f159fe5aa7e63dff7a42.zip
SPIGOT-3286: Call BlockFormEvent for Concrete Powder -> Concrete
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java5
1 files changed, 3 insertions, 2 deletions
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);