Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@b0ef3ca Only call EntityDamageEvents before actuallyHurt (#11045)
PaperMC/Paper@20889d0 Fix method reflection remapping with null parameter types passed
This commit is contained in:
granny
2024-07-11 08:54:06 +00:00
parent ff19bccd8c
commit b3709b1f4d
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 5e34a304b0066b238a9381bd35d5f499db54b54b..b253e87d7d257b546ff4a9c607834d6e26497e8a 100644
index e2e0570e1b866ecb2080013df32071fc4d46290f..387b532cdb17243562f67de4d0dde20b35bd8abb 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3022,6 +3022,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3038,6 +3038,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
if (f3 > 0.0F) {
this.playSound(this.getFallDamageSound((int) f3), 1.0F, 1.0F);