From 0fb296468e2cd51936c4a9800a6dd54bbe8db42b Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Sun, 5 Jun 2022 16:30:03 +1000 Subject: [PATCH] SPIGOT-7025: Use existing item in hand for ranged Drowned attack By: Doc --- .../world/entity/monster/EntityDrowned.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 paper-server/nms-patches/net/minecraft/world/entity/monster/EntityDrowned.patch diff --git a/paper-server/nms-patches/net/minecraft/world/entity/monster/EntityDrowned.patch b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntityDrowned.patch new file mode 100644 index 0000000000..f0e16cd30f --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/world/entity/monster/EntityDrowned.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/world/entity/monster/EntityDrowned.java ++++ b/net/minecraft/world/entity/monster/EntityDrowned.java +@@ -239,7 +239,7 @@ + + @Override + public void performRangedAttack(EntityLiving entityliving, float f) { +- EntityThrownTrident entitythrowntrident = new EntityThrownTrident(this.level, this, new ItemStack(Items.TRIDENT)); ++ EntityThrownTrident entitythrowntrident = new EntityThrownTrident(this.level, this, this.getItemInHand(net.minecraft.world.entity.projectile.ProjectileHelper.getWeaponHoldingHand(this, Items.TRIDENT))); // CraftBukkit - Use Trident in hand like skeletons (SPIGOT-7025) + double d0 = entityliving.getX() - this.getX(); + double d1 = entityliving.getY(0.3333333333333333D) - entitythrowntrident.getY(); + double d2 = entityliving.getZ() - this.getZ();