mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-28 14:37:35 +02:00
90fe0d58a5
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 897a0a23 SPIGOT-5753: Back PotionType by a minecraft registry 255b2aa1 SPIGOT-7080: Add World#locateNearestBiome ff984826 Remove javadoc.io doc links CraftBukkit Changes: 71b0135cc SPIGOT-5753: Back PotionType by a minecraft registry a6bcb8489 SPIGOT-7080: Add World#locateNearestBiome ad0e57434 SPIGOT-7502: CraftMetaItem - cannot deserialize BlockStateTag b3efca57a SPIGOT-6400: Use Mockito instead of InvocationHandler 38c599f9d PR-1272: Only allow one entity in CraftItem instead of two f065271ac SPIGOT-7498: ChunkSnapshot.getBlockEmittedLight() gets 64 blocks upper in Overworld Spigot Changes: e0e223fe Remove javadoc.io doc links
47 lines
2.5 KiB
Diff
47 lines
2.5 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 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;
|