1.21.4 (hard fork) - fix build

This commit is contained in:
Blast-MC
2025-01-13 23:07:07 -05:00
parent 97a0af2d13
commit 30cfeef7c6
3 changed files with 3 additions and 3 deletions

View File

@@ -6,7 +6,7 @@
AbstractArrow arrow = this.getArrow(projectile, distanceFactor, itemInHand); AbstractArrow arrow = this.getArrow(projectile, distanceFactor, itemInHand);
+ +
+ // Parchment start + // Parchment start
+ gg.projecteden.parchment.event.entity.PreEntityShootBowEvent preEvent = new gg.projecteden.parchment.event.entity.PreEntityShootBowEvent(this.getBukkitEntity(), this.getMainHandItem().asBukkitCopy(), itemstack1.asBukkitCopy()); + gg.projecteden.parchment.event.entity.PreEntityShootBowEvent preEvent = new gg.projecteden.parchment.event.entity.PreEntityShootBowEvent(this.getBukkitEntity(), this.getMainHandItem().asBukkitCopy(), projectile.asBukkitCopy());
+ if (!preEvent.callEvent()) return; + if (!preEvent.callEvent()) return;
+ // Parchment end + // Parchment end
+ +

View File

@@ -5,7 +5,7 @@
ItemStack projectile = this.getProjectile(itemInHand); ItemStack projectile = this.getProjectile(itemInHand);
AbstractArrow mobArrow = ProjectileUtil.getMobArrow(this, projectile, distanceFactor, itemInHand); AbstractArrow mobArrow = ProjectileUtil.getMobArrow(this, projectile, distanceFactor, itemInHand);
+ +
+ gg.projecteden.parchment.event.entity.PreEntityShootBowEvent preEvent = new gg.projecteden.parchment.event.entity.PreEntityShootBowEvent(this.getBukkitEntity(), this.getMainHandItem().asBukkitCopy(), itemstack1.asBukkitCopy()); + gg.projecteden.parchment.event.entity.PreEntityShootBowEvent preEvent = new gg.projecteden.parchment.event.entity.PreEntityShootBowEvent(this.getBukkitEntity(), this.getMainHandItem().asBukkitCopy(), projectile.asBukkitCopy());
+ if (!preEvent.callEvent()) return; + if (!preEvent.callEvent()) return;
+ // Parchment end + // Parchment end
+ +

View File

@@ -15,7 +15,7 @@
ChargedProjectiles chargedProjectiles = weapon.set(DataComponents.CHARGED_PROJECTILES, ChargedProjectiles.EMPTY); ChargedProjectiles chargedProjectiles = weapon.set(DataComponents.CHARGED_PROJECTILES, ChargedProjectiles.EMPTY);
+ +
+ // Parchment start + // Parchment start
+ gg.projecteden.parchment.event.entity.PreEntityShootBowEvent preEvent = new gg.projecteden.parchment.event.entity.PreEntityShootBowEvent(shooter.getBukkitEntity(), stack.asBukkitCopy(), chargedProjectiles.getItems().get(0).asBukkitCopy()); + gg.projecteden.parchment.event.entity.PreEntityShootBowEvent preEvent = new gg.projecteden.parchment.event.entity.PreEntityShootBowEvent(shooter.getBukkitEntity(), weapon.asBukkitCopy(), chargedProjectiles.getItems().get(0).asBukkitCopy());
+ if (!preEvent.callEvent()) return; + if (!preEvent.callEvent()) return;
+ // TODO: handle relative flag in CrossbowAttackMob#shootCrossbowProjectile + // TODO: handle relative flag in CrossbowAttackMob#shootCrossbowProjectile
+ // Parchment end + // Parchment end