Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@70b0e84 Properly apply damage tick after absorption (#11043)
This commit is contained in:
granny
2024-07-08 19:57:42 -07:00
parent cb0f04bd77
commit ff19bccd8c
12 changed files with 30 additions and 30 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Toggle for kinetic damage
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 686ce519b70e2193e207aca16f4ef15cb36840b5..817332fcfb45193cd19ff6ef6d702bf8c09f576f 100644
index 5e34a304b0066b238a9381bd35d5f499db54b54b..b253e87d7d257b546ff4a9c607834d6e26497e8a 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3023,6 +3023,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3022,6 +3022,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
if (f3 > 0.0F) {
this.playSound(this.getFallDamageSound((int) f3), 1.0F, 1.0F);