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 3888f13a49af26b0ece8813b607c20fc380cecd5..1e045397763e8233c2e8f9955468788374b80068 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java @@ -37,16 +37,19 @@ public class ThrownTrident extends AbstractArrow { public ThrownTrident(EntityType<? extends ThrownTrident> type, Level world) { super(type, world); + 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, (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()); } @@ -137,7 +140,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 Entity entity1 = this.getOwner(); DamageSource damagesource = this.damageSources().trident(this, (Entity) (entity1 == null ? this : entity1)); Level world = this.level();