3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-24 15:20:11 +01:00
Paper/nms-patches/ItemCrossbow.patch

44 Zeilen
1.9 KiB
Diff

2019-04-23 04:00:00 +02:00
--- a/net/minecraft/server/ItemCrossbow.java
+++ b/net/minecraft/server/ItemCrossbow.java
2020-06-25 02:00:00 +02:00
@@ -75,6 +75,11 @@
itemstack1 = new ItemStack(Items.ARROW);
itemstack2 = itemstack1.cloneItemStack();
}
+ // CraftBukkit start - SPIGOT-4870, MC-150847
+ else if (itemstack1.isEmpty()) {
2019-05-14 02:00:00 +02:00
+ return false;
+ }
+ // CraftBukkit end
2019-05-14 02:00:00 +02:00
if (!a(entityliving, itemstack, itemstack1, k > 0, flag)) {
return false;
2020-06-25 02:00:00 +02:00
@@ -198,11 +203,27 @@
2019-04-23 04:00:00 +02:00
vector3fa.a(quaternion);
((IProjectile) object).shoot((double) vector3fa.a(), (double) vector3fa.b(), (double) vector3fa.c(), f1, f2);
}
+ // CraftBukkit start
+ org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(entityliving, itemstack, (Entity) object, f);
+ if (event.isCancelled()) {
+ event.getProjectile().remove();
+ return;
+ }
+ // CraftBukkit end
itemstack.damage(flag1 ? 3 : 1, entityliving, (entityliving1) -> {
2020-01-21 22:00:00 +01:00
entityliving1.broadcastItemBreak(enumhand);
2019-04-23 04:00:00 +02:00
});
- world.addEntity((Entity) object);
+ // CraftBukkit start
+ if (event.getProjectile() == ((Entity) object).getBukkitEntity()) {
+ if (!world.addEntity((Entity) object)) {
+ if (entityliving instanceof EntityPlayer) {
+ ((EntityPlayer) entityliving).getBukkitEntity().updateInventory();
+ }
+ return;
+ }
+ }
+ // CraftBukkit end
2019-12-10 23:00:00 +01:00
world.playSound((EntityHuman) null, entityliving.locX(), entityliving.locY(), entityliving.locZ(), SoundEffects.ITEM_CROSSBOW_SHOOT, SoundCategory.PLAYERS, 1.0F, f);
2019-04-23 04:00:00 +02:00
}
}