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

32 lines
1.8 KiB
Diff
Raw Normal View History

2024-04-24 01:15:00 +10:00
--- a/net/minecraft/world/item/ItemProjectileWeapon.java
+++ b/net/minecraft/world/item/ItemProjectileWeapon.java
2024-10-23 02:15:00 +11:00
@@ -54,9 +54,25 @@
float f6 = f4 + f5 * (float) ((i + 1) / 2) * f3;
2024-04-24 01:15:00 +10:00
2024-10-23 02:15:00 +11:00
f5 = -f5;
- IProjectile.spawnProjectile(this.createProjectile(worldserver, entityliving, itemstack, itemstack1, flag), worldserver, itemstack1, (iprojectile) -> {
- this.shootProjectile(entityliving, iprojectile, i, f, f1, f6, entityliving1);
- });
2024-04-24 01:15:00 +10:00
+ // CraftBukkit start
2024-10-23 02:15:00 +11:00
+ IProjectile iprojectile = this.createProjectile(worldserver, entityliving, itemstack, itemstack1, flag);
+ this.shootProjectile(entityliving, iprojectile, i, f, f1, f6, entityliving1);
+
2024-04-24 01:15:00 +10:00
+ org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(entityliving, itemstack, itemstack1, iprojectile, enumhand, f, true);
+ if (event.isCancelled()) {
+ event.getProjectile().remove();
+ return;
+ }
+
+ if (event.getProjectile() == iprojectile.getBukkitEntity()) {
2024-10-23 02:15:00 +11:00
+ if (IProjectile.spawnProjectile(iprojectile, worldserver, itemstack1).isRemoved()) {
2024-04-24 01:15:00 +10:00
+ if (entityliving instanceof net.minecraft.server.level.EntityPlayer) {
+ ((net.minecraft.server.level.EntityPlayer) entityliving).getBukkitEntity().updateInventory();
+ }
+ return;
+ }
+ }
+ // CraftBukkit end
2024-06-14 01:05:00 +10:00
itemstack.hurtAndBreak(this.getDurabilityUse(itemstack1), entityliving, EntityLiving.getSlotForHand(enumhand));
if (itemstack.isEmpty()) {
break;