summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-12-02 09:38:47 +1100
committermd_5 <git@md-5.net>2016-12-02 09:38:47 +1100
commit71d3a3c774a2b53458456c49cf6dd2796934ef2d (patch)
tree625878a2854420bb765b7b4a6768f217e9ace00d
parent281824bf6fa2fa7983c96ec771fcf7bd3ffa768a (diff)
downloadbukkit-71d3a3c774a2b53458456c49cf6dd2796934ef2d.tar
bukkit-71d3a3c774a2b53458456c49cf6dd2796934ef2d.tar.gz
bukkit-71d3a3c774a2b53458456c49cf6dd2796934ef2d.tar.lz
bukkit-71d3a3c774a2b53458456c49cf6dd2796934ef2d.tar.xz
bukkit-71d3a3c774a2b53458456c49cf6dd2796934ef2d.zip
SPIGOT-911: Add hitBlock to PorjectileHitEvent
-rw-r--r--src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java22
1 files changed, 21 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java b/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java
index 5bcc2941..35f4148b 100644
--- a/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java
+++ b/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java
@@ -1,5 +1,6 @@
package org.bukkit.event.entity;
+import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Projectile;
import org.bukkit.event.HandlerList;
@@ -10,14 +11,24 @@ import org.bukkit.event.HandlerList;
public class ProjectileHitEvent extends EntityEvent {
private static final HandlerList handlers = new HandlerList();
private final Entity hitEntity;
+ private final Block hitBlock;
public ProjectileHitEvent(final Projectile projectile) {
- this(projectile, null);
+ this(projectile, null, null);
}
public ProjectileHitEvent(final Projectile projectile, Entity hitEntity) {
+ this(projectile, hitEntity, null);
+ }
+
+ public ProjectileHitEvent(final Projectile projectile, Block hitBlock) {
+ this(projectile, null, hitBlock);
+ }
+
+ public ProjectileHitEvent(final Projectile projectile, Entity hitEntity, Block hitBlock) {
super(projectile);
this.hitEntity = hitEntity;
+ this.hitBlock = hitBlock;
}
@Override
@@ -26,6 +37,15 @@ public class ProjectileHitEvent extends EntityEvent {
}
/**
+ * Gets the block that was hit, if it was a block that was hit.
+ *
+ * @return hit block or else null
+ */
+ public Block getHitBlock() {
+ return hitBlock;
+ }
+
+ /**
* Gets the entity that was hit, if it was an entity that was hit.
*
* @return hit entity or else null