summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/bukkit/craftbukkit/event
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-07-20 10:29:34 +1000
committermd_5 <git@md-5.net>2018-07-20 10:29:34 +1000
commitca1af9368ba92fed20fd3529a45a9e7b11960c58 (patch)
treea8e2895a3b90aa5782a0b24fba6cb1e551bdc343 /src/main/java/org/bukkit/craftbukkit/event
parent49ac8a74461de1c2571296e300de001a93e00c75 (diff)
downloadcraftbukkit-ca1af9368ba92fed20fd3529a45a9e7b11960c58.tar
craftbukkit-ca1af9368ba92fed20fd3529a45a9e7b11960c58.tar.gz
craftbukkit-ca1af9368ba92fed20fd3529a45a9e7b11960c58.tar.lz
craftbukkit-ca1af9368ba92fed20fd3529a45a9e7b11960c58.tar.xz
craftbukkit-ca1af9368ba92fed20fd3529a45a9e7b11960c58.zip
Update EntityChangeBlockEvent to new BlockData API
Diffstat (limited to 'src/main/java/org/bukkit/craftbukkit/event')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java4
1 files changed, 2 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 951a0683..5793bdf4 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -24,6 +24,7 @@ import org.bukkit.craftbukkit.CraftStatistic;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.block.CraftBlock;
import org.bukkit.craftbukkit.block.CraftBlockState;
+import org.bukkit.craftbukkit.block.data.CraftBlockData;
import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.craftbukkit.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.entity.CraftPlayer;
@@ -704,9 +705,8 @@ public class CraftEventFactory {
public static EntityChangeBlockEvent callEntityChangeBlockEvent(Entity entity, BlockPosition position, IBlockData newBlock, boolean cancelled) {
Block block = entity.world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ());
- Material material = CraftMagicNumbers.getMaterial(newBlock).getItemType();
- EntityChangeBlockEvent event = new EntityChangeBlockEvent(entity.getBukkitEntity(), block, material, (byte) 0);
+ EntityChangeBlockEvent event = new EntityChangeBlockEvent(entity.getBukkitEntity(), block, CraftBlockData.fromData(newBlock));
event.setCancelled(cancelled);
event.getEntity().getServer().getPluginManager().callEvent(event);
return event;