1 files changed, 46 insertions, 0 deletions
diff --git a/patches/server/1005-Allow-trident-custom-damage.patch b/patches/server/1005-Allow-trident-custom-damage.patch
new file mode 100644
index 0000000000..dcbcba2af5
--- /dev/null
+++ b/patches/server/1005-Allow-trident-custom-damage.patch
@@ -0,0 +1,46 @@
+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/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
+index cabcd68032649aa5ec5f1ac495a08a5af76f0f86..6c176933967f6ee98da3026f16a10efe4c3842fe 100644
+--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
++++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
+@@ -65,7 +65,7 @@ public abstract class AbstractArrow extends Projectile {
+     public AbstractArrow.Pickup pickup;
+     public int shakeTime;
+     public int life;
+-    private double baseDamage;
++    protected double baseDamage; // Paper - private -> protected
+     public int knockback;
+     public SoundEvent soundEvent;
+     @Nullable
+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 454dd67920826b8b62c2654abfd43fc08c2648e4..a6bc277b6589dd7104566542733327822d6299a4 100644
+--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
++++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
+@@ -33,11 +33,13 @@ public class ThrownTrident extends AbstractArrow {
+ 
+     public ThrownTrident(EntityType<? extends ThrownTrident> type, Level world) {
+         super(type, world);
++        this.baseDamage = net.minecraft.world.item.TridentItem.BASE_DAMAGE; // Paper
+         this.tridentItem = new ItemStack(Items.TRIDENT);
+     }
+ 
+     public ThrownTrident(Level world, LivingEntity owner, ItemStack stack) {
+         super(EntityType.TRIDENT, owner, world);
++        this.baseDamage = net.minecraft.world.item.TridentItem.BASE_DAMAGE; // Paper
+         this.tridentItem = new ItemStack(Items.TRIDENT);
+         this.tridentItem = stack.copy();
+         this.entityData.set(ThrownTrident.ID_LOYALTY, (byte) EnchantmentHelper.getLoyalty(stack));
+@@ -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.baseDamage; // Paper
+ 
+         if (entity instanceof LivingEntity) {
+             LivingEntity entityliving = (LivingEntity) entity;