mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-09 19:49:35 +01:00
e00c85fd8c
By: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
31 lines
1.5 KiB
Diff
31 lines
1.5 KiB
Diff
--- a/net/minecraft/world/item/ItemCrossbow.java
|
|
+++ b/net/minecraft/world/item/ItemCrossbow.java
|
|
@@ -236,11 +236,27 @@
|
|
|
|
((IProjectile) object).shoot((double) vector3f.x(), (double) vector3f.y(), (double) vector3f.z(), f1, f2);
|
|
}
|
|
+ // CraftBukkit start
|
|
+ org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(entityliving, itemstack, itemstack1, (Entity) object, entityliving.getUsedItemHand(), f, true);
|
|
+ if (event.isCancelled()) {
|
|
+ event.getProjectile().remove();
|
|
+ return;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
|
|
itemstack.hurtAndBreak(flag1 ? 3 : 1, entityliving, (entityliving1) -> {
|
|
entityliving1.broadcastBreakEvent(enumhand);
|
|
});
|
|
- world.addFreshEntity((Entity) object);
|
|
+ // CraftBukkit start
|
|
+ if (event.getProjectile() == ((Entity) object).getBukkitEntity()) {
|
|
+ if (!world.addFreshEntity((Entity) object)) {
|
|
+ if (entityliving instanceof EntityPlayer) {
|
|
+ ((EntityPlayer) entityliving).getBukkitEntity().updateInventory();
|
|
+ }
|
|
+ return;
|
|
+ }
|
|
+ }
|
|
+ // CraftBukkit end
|
|
world.playSound((EntityHuman) null, entityliving.getX(), entityliving.getY(), entityliving.getZ(), SoundEffects.CROSSBOW_SHOOT, SoundCategory.PLAYERS, 1.0F, f);
|
|
}
|
|
}
|