From 5c5a5fb93cbd83269d2c5ddc85018f3e41c49c3c Mon Sep 17 00:00:00 2001 From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Date: Fri, 21 Jun 2024 18:48:18 +0200 Subject: [PATCH] Fix base damage for trident (#10948) --- patches/server/Allow-trident-custom-damage.patch | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/patches/server/Allow-trident-custom-damage.patch b/patches/server/Allow-trident-custom-damage.patch index abe325f080..65a2a4c1cb 100644 --- a/patches/server/Allow-trident-custom-damage.patch +++ b/patches/server/Allow-trident-custom-damage.patch @@ -17,6 +17,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public ThrownTrident(Level world, LivingEntity owner, ItemStack stack) { super(EntityType.TRIDENT, owner, world, stack, (ItemStack) null); ++ this.setBaseDamage(net.minecraft.world.item.TridentItem.BASE_DAMAGE); // Paper - Allow trident custom damage + this.entityData.set(ThrownTrident.ID_LOYALTY, this.getLoyaltyFromItem(stack)); + this.entityData.set(ThrownTrident.ID_FOIL, stack.hasFoil()); + } + + public ThrownTrident(Level world, double x, double y, double z, ItemStack stack) { + super(EntityType.TRIDENT, x, y, z, world, stack, stack); + this.setBaseDamage(net.minecraft.world.item.TridentItem.BASE_DAMAGE); // Paper - Allow trident custom damage this.entityData.set(ThrownTrident.ID_LOYALTY, this.getLoyaltyFromItem(stack)); this.entityData.set(ThrownTrident.ID_FOIL, stack.hasFoil());