From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Date: Tue, 12 Jul 2022 18:01:14 +0200 Subject: [PATCH] Allow trident custom damage diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java index cbe8593cecd84f1598649801bebcb46364044eef..51931e5cecf4c9ed8442136b18a94c7da89cf77d 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java @@ -34,10 +34,12 @@ public class ThrownTrident extends AbstractArrow { public ThrownTrident(EntityType type, Level world) { super(type, world, ThrownTrident.DEFAULT_ARROW_STACK); + this.setBaseDamage(net.minecraft.world.item.TridentItem.BASE_DAMAGE); // Paper - Allow trident custom damage } public ThrownTrident(Level world, LivingEntity owner, ItemStack stack) { super(EntityType.TRIDENT, owner, world, stack); + this.setBaseDamage(net.minecraft.world.item.TridentItem.BASE_DAMAGE); // Paper - Allow trident custom damage this.entityData.set(ThrownTrident.ID_LOYALTY, (byte) EnchantmentHelper.getLoyalty(stack)); this.entityData.set(ThrownTrident.ID_FOIL, stack.hasFoil()); } @@ -121,7 +123,7 @@ public class ThrownTrident extends AbstractArrow { @Override protected void onHitEntity(EntityHitResult entityHitResult) { Entity entity = entityHitResult.getEntity(); - float f = 8.0F; + float f = (float) this.getBaseDamage(); // Paper - Allow trident custom damage if (entity instanceof LivingEntity) { LivingEntity entityliving = (LivingEntity) entity;