mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-30 16:19:03 +01:00
45 lines
2.4 KiB
Diff
45 lines
2.4 KiB
Diff
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/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
|
|
@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
|
|
@@ -0,0 +0,0 @@ public class ThrownTrident extends AbstractArrow {
|
|
|
|
public ThrownTrident(EntityType<? extends ThrownTrident> type, Level world) {
|
|
super(type, world, ThrownTrident.DEFAULT_ARROW_STACK);
|
|
+ this.baseDamage = net.minecraft.world.item.TridentItem.BASE_DAMAGE; // Paper
|
|
}
|
|
|
|
public ThrownTrident(Level world, LivingEntity owner, ItemStack stack) {
|
|
super(EntityType.TRIDENT, owner, world, stack);
|
|
+ this.baseDamage = net.minecraft.world.item.TridentItem.BASE_DAMAGE; // Paper
|
|
this.entityData.set(ThrownTrident.ID_LOYALTY, (byte) EnchantmentHelper.getLoyalty(stack));
|
|
this.entityData.set(ThrownTrident.ID_FOIL, stack.hasFoil());
|
|
}
|
|
@@ -0,0 +0,0 @@ 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;
|