From 30cfeef7c69c6349962e38b24939ec3d2917298b Mon Sep 17 00:00:00 2001 From: Blast-MC Date: Mon, 13 Jan 2025 23:07:07 -0500 Subject: [PATCH] 1.21.4 (hard fork) - fix build --- .../minecraft/world/entity/monster/AbstractSkeleton.java.patch | 2 +- .../net/minecraft/world/entity/monster/Illusioner.java.patch | 2 +- .../sources/net/minecraft/world/item/CrossbowItem.java.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/parchment-server/minecraft-patches/sources/net/minecraft/world/entity/monster/AbstractSkeleton.java.patch b/parchment-server/minecraft-patches/sources/net/minecraft/world/entity/monster/AbstractSkeleton.java.patch index e80d72c..8feb9f0 100644 --- a/parchment-server/minecraft-patches/sources/net/minecraft/world/entity/monster/AbstractSkeleton.java.patch +++ b/parchment-server/minecraft-patches/sources/net/minecraft/world/entity/monster/AbstractSkeleton.java.patch @@ -6,7 +6,7 @@ AbstractArrow arrow = this.getArrow(projectile, distanceFactor, itemInHand); + + // 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; + // Parchment end + diff --git a/parchment-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Illusioner.java.patch b/parchment-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Illusioner.java.patch index 946ab81..673520a 100644 --- a/parchment-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Illusioner.java.patch +++ b/parchment-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Illusioner.java.patch @@ -5,7 +5,7 @@ ItemStack projectile = this.getProjectile(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; + // Parchment end + diff --git a/parchment-server/minecraft-patches/sources/net/minecraft/world/item/CrossbowItem.java.patch b/parchment-server/minecraft-patches/sources/net/minecraft/world/item/CrossbowItem.java.patch index afb9d4a..f53a898 100644 --- a/parchment-server/minecraft-patches/sources/net/minecraft/world/item/CrossbowItem.java.patch +++ b/parchment-server/minecraft-patches/sources/net/minecraft/world/item/CrossbowItem.java.patch @@ -15,7 +15,7 @@ ChargedProjectiles chargedProjectiles = weapon.set(DataComponents.CHARGED_PROJECTILES, ChargedProjectiles.EMPTY); + + // 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; + // TODO: handle relative flag in CrossbowAttackMob#shootCrossbowProjectile + // Parchment end