OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-12 18:01:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-4735: ProjectileHitEvent Fires Immediately

Browse source
This commit is contained in:
md_5 2019-04-25 09:23:21 +10:00
parent 14df075f80
commit de6cdd0364
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View file

@ -1052,7 +1052,11 @@ public class CraftEventFactory {
return event; return event;
} }
public static ProjectileHitEvent callProjectileHitEvent(Entity entity, MovingObjectPosition position) { public static void callProjectileHitEvent(Entity entity, MovingObjectPosition position) {
if (position.getType() == MovingObjectPosition.EnumMovingObjectType.MISS) {
return;
}
Block hitBlock = null; Block hitBlock = null;
BlockFace hitFace = null; BlockFace hitFace = null;
if (position.getType() == MovingObjectPosition.EnumMovingObjectType.BLOCK) { if (position.getType() == MovingObjectPosition.EnumMovingObjectType.BLOCK) {
@ -1068,7 +1072,6 @@ public class CraftEventFactory {
ProjectileHitEvent event = new ProjectileHitEvent((Projectile) entity.getBukkitEntity(), hitEntity, hitBlock, hitFace); ProjectileHitEvent event = new ProjectileHitEvent((Projectile) entity.getBukkitEntity(), hitEntity, hitBlock, hitFace);
entity.world.getServer().getPluginManager().callEvent(event); entity.world.getServer().getPluginManager().callEvent(event);
return event;
} }
public static ExpBottleEvent callExpBottleEvent(Entity entity, int exp) { public static ExpBottleEvent callExpBottleEvent(Entity entity, int exp) {