diff options
author | md_5 <git@md-5.net> | 2016-12-02 09:38:50 +1100 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-12-02 09:38:50 +1100 |
commit | 1d54397474b270227e82aabf15ef5444ecfe839c (patch) | |
tree | 7b621aa295f993546ae8f91311b6916babbce946 /src | |
parent | b6ad714e853042def52620befe9bc85d0137cd71 (diff) | |
download | craftbukkit-1d54397474b270227e82aabf15ef5444ecfe839c.tar craftbukkit-1d54397474b270227e82aabf15ef5444ecfe839c.tar.gz craftbukkit-1d54397474b270227e82aabf15ef5444ecfe839c.tar.lz craftbukkit-1d54397474b270227e82aabf15ef5444ecfe839c.tar.xz craftbukkit-1d54397474b270227e82aabf15ef5444ecfe839c.zip |
SPIGOT-911: Add hitBlock to PorjectileHitEvent
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java index 2621b777..05084130 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -779,7 +779,13 @@ public class CraftEventFactory { } public static ProjectileHitEvent callProjectileHitEvent(Entity entity, MovingObjectPosition position) { - ProjectileHitEvent event = new ProjectileHitEvent((Projectile) entity.getBukkitEntity(), position.entity == null ? null : position.entity.getBukkitEntity()); + Block hitBlock = null; + if (position.type == MovingObjectPosition.EnumMovingObjectType.BLOCK) { + BlockPosition blockposition = position.a(); + hitBlock = entity.getBukkitEntity().getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); + } + + ProjectileHitEvent event = new ProjectileHitEvent((Projectile) entity.getBukkitEntity(), position.entity == null ? null : position.entity.getBukkitEntity(), hitBlock); entity.world.getServer().getPluginManager().callEvent(event); return event; } |