OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 23:38:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix base damage for trident (#10948)

Browse source
This commit is contained in:
Lulu13022002 2024-06-21 18:48:18 +02:00 committed by GitHub
parent 0a1b133c28
commit a0fad76fb6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
patches/server/0877-Allow-trident-custom-damage.patch
View file

@ -5,10 +5,10 @@ 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 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 e45c3a9805d9fac1fabe6d891c817743acd9969e..cb71f468e90f076caf2c0dcc5f2ba2745c737c22 100644 index e45c3a9805d9fac1fabe6d891c817743acd9969e..44c733c5b2c3e9942f28e882ad72306a24459c2c 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
@@ -36,10 +36,12 @@ public class ThrownTrident extends AbstractArrow { @@ -36,16 +36,19 @@ public class ThrownTrident extends AbstractArrow {
public ThrownTrident(EntityType<? extends ThrownTrident> type, Level world) { public ThrownTrident(EntityType<? extends ThrownTrident> type, Level world) {
super(type, world); super(type, world);
@ -21,7 +21,14 @@ index e45c3a9805d9fac1fabe6d891c817743acd9969e..cb71f468e90f076caf2c0dcc5f2ba274
this.entityData.set(ThrownTrident.ID_LOYALTY, this.getLoyaltyFromItem(stack)); this.entityData.set(ThrownTrident.ID_LOYALTY, this.getLoyaltyFromItem(stack));
this.entityData.set(ThrownTrident.ID_FOIL, stack.hasFoil()); this.entityData.set(ThrownTrident.ID_FOIL, stack.hasFoil());
} }
@@ -129,7 +131,7 @@ public class ThrownTrident extends AbstractArrow {
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());
}
@@ -129,7 +132,7 @@ public class ThrownTrident extends AbstractArrow {
@Override @Override
protected void onHitEntity(EntityHitResult entityHitResult) { protected void onHitEntity(EntityHitResult entityHitResult) {
Entity entity = entityHitResult.getEntity(); Entity entity = entityHitResult.getEntity();