craftbukkit/nms-patches/net/minecraft/world/item/ItemBow.patch

36 lines
2.1 KiB
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/world/item/ItemBow.java
+++ b/net/minecraft/world/item/ItemBow.java
2021-06-11 15:00:00 +10:00
@@ -64,6 +64,14 @@
2021-11-22 09:00:00 +11:00
if (EnchantmentManager.getItemEnchantmentLevel(Enchantments.FLAMING_ARROWS, itemstack) > 0) {
entityarrow.setSecondsOnFire(100);
}
2016-03-01 08:32:46 +11:00
+ // CraftBukkit start
2021-11-22 09:00:00 +11:00
+ org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(entityhuman, itemstack, itemstack1, entityarrow, entityhuman.getUsedItemHand(), f, !flag1);
2016-03-01 08:32:46 +11:00
+ if (event.isCancelled()) {
+ event.getProjectile().remove();
+ return;
+ }
+ flag1 = !event.shouldConsumeItem();
+ // CraftBukkit end
2021-11-22 09:00:00 +11:00
itemstack.hurtAndBreak(1, entityhuman, (entityhuman1) -> {
entityhuman1.broadcastBreakEvent(entityhuman.getUsedItemHand());
2021-06-11 15:00:00 +10:00
@@ -72,7 +80,16 @@
entityarrow.pickup = EntityArrow.PickupStatus.CREATIVE_ONLY;
2016-03-01 08:32:46 +11:00
}
2021-11-22 09:00:00 +11:00
- world.addFreshEntity(entityarrow);
+ // CraftBukkit start
2016-03-01 08:32:46 +11:00
+ if (event.getProjectile() == entityarrow.getBukkitEntity()) {
2021-11-22 09:00:00 +11:00
+ if (!world.addFreshEntity(entityarrow)) {
2021-03-16 09:00:00 +11:00
+ if (entityhuman instanceof net.minecraft.server.level.EntityPlayer) {
+ ((net.minecraft.server.level.EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
+ }
+ return;
+ }
2016-03-01 08:32:46 +11:00
+ }
+ // CraftBukkit end
}
2021-11-22 09:00:00 +11:00
world.playSound((EntityHuman) null, entityhuman.getX(), entityhuman.getY(), entityhuman.getZ(), SoundEffects.ARROW_SHOOT, SoundCategory.PLAYERS, 1.0F, 1.0F / (world.getRandom().nextFloat() * 0.4F + 1.2F) + f * 0.5F);