mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-28 19:22:50 +01:00
835bc39b03
Updated Upstream (Bukkit/CraftBukkit/Spigot) Bukkit Changes: 2dcc44dc SPIGOT-4307: Fix hacky API for banners on shields e0fc6572 SPIGOT-4309: Add "forced" display of particles efeeab2f Add index to README.md for easier navigation f502bc6f Update to Minecraft 1.13.1 CraftBukkit Changes:d0bb0a1dFix some tests randomly failing997d378dFix client stall in specific teleportation scenariosb3dc2366SPIGOT-4307: Fix hacky API for banners on shields2a271162SPIGOT-4301: Fix more invalid enchants5d0d83bbSPIGOT-4309: Add "forced" display of particlesa6772578Add additional tests for CraftBlockDatace1af0c3Update to Minecraft 1.13.1 Spigot Changes: 2440e189 Rebuild patches 4ecffced Update to Minecraft 1.13.1
57 lines
2 KiB
Diff
57 lines
2 KiB
Diff
From 2bf0516d4ec180c0bbd9f50c67f205a99b8c08ca Mon Sep 17 00:00:00 2001
|
|
From: Brokkonaut <hannos17@gmx.de>
|
|
Date: Sat, 30 Jun 2018 05:45:04 +0200
|
|
Subject: [PATCH] Improve ProjectileHitEvent to include the BlockFace where the
|
|
projectile has hit
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java b/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java
|
|
index 35f4148bb..db105e764 100644
|
|
--- a/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java
|
|
@@ -12,6 +12,7 @@ public class ProjectileHitEvent extends EntityEvent {
|
|
private static final HandlerList handlers = new HandlerList();
|
|
private final Entity hitEntity;
|
|
private final Block hitBlock;
|
|
+ private final org.bukkit.block.BlockFace hitBlockFace; // Paper
|
|
|
|
public ProjectileHitEvent(final Projectile projectile) {
|
|
this(projectile, null, null);
|
|
@@ -26,9 +27,16 @@ public class ProjectileHitEvent extends EntityEvent {
|
|
}
|
|
|
|
public ProjectileHitEvent(final Projectile projectile, Entity hitEntity, Block hitBlock) {
|
|
+ // Paper Start - Add a constructor that includes a BlockFace parameter
|
|
+ this(projectile, hitEntity, hitBlock, null);
|
|
+ }
|
|
+
|
|
+ public ProjectileHitEvent(final Projectile projectile, Entity hitEntity, Block hitBlock, org.bukkit.block.BlockFace hitBlockFace) {
|
|
+ // Paper End
|
|
super(projectile);
|
|
this.hitEntity = hitEntity;
|
|
this.hitBlock = hitBlock;
|
|
+ this.hitBlockFace = hitBlockFace; // Paper
|
|
}
|
|
|
|
@Override
|
|
@@ -45,6 +53,17 @@ public class ProjectileHitEvent extends EntityEvent {
|
|
return hitBlock;
|
|
}
|
|
|
|
+ // Paper Start
|
|
+ /**
|
|
+ * Gets the face of the block that the projectile has hit.
|
|
+ *
|
|
+ * @return hit block face or else null
|
|
+ */
|
|
+ public org.bukkit.block.BlockFace getHitBlockFace() {
|
|
+ return hitBlockFace;
|
|
+ }
|
|
+ // Paper End
|
|
+
|
|
/**
|
|
* Gets the entity that was hit, if it was an entity that was hit.
|
|
*
|
|
--
|
|
2.18.0
|
|
|