diff options
Diffstat (limited to 'patches/server/0891-Allow-trident-custom-damage.patch')
-rw-r--r-- | patches/server/0891-Allow-trident-custom-damage.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/patches/server/0891-Allow-trident-custom-damage.patch b/patches/server/0891-Allow-trident-custom-damage.patch new file mode 100644 index 0000000000..eaa126da9c --- /dev/null +++ b/patches/server/0891-Allow-trident-custom-damage.patch @@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Lulu13022002 <[email protected]> +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 c75ac52f302e8e29e0bdea32c85ccf6713257a9b..3ff06cc6ad35567bcb1f29115db63c11a8e79dbb 100644 +--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java ++++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java +@@ -35,10 +35,12 @@ 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); ++ 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()); + } +@@ -128,7 +130,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 entityliving) { + f += EnchantmentHelper.getDamageBonus(this.getPickupItemStackOrigin(), entityliving.getType()); |