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

@@ -18,10 +18,10 @@ index bb16b73b6a99ca8fa1b25cc1f8a0aa77c5009d27..04c6736d792f9341e21ff76f0ee8efaf
&& (!(this instanceof Player player) || !player.getAbilities().invulnerable))) {
// Paper end - Configurable nether ceiling damage
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 2e71f39a37d251f9d0780484776e0f84073d84e3..298ec8aace088d1817a2b4b8b481b5ebfa73949e 100644
index 54c6666abb8c674f354161489faf06147f4672c6..62555037076fe19d80fb0df09c3aa085bfb6a555 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2615,7 +2615,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -2631,7 +2631,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@Override
protected void onBelowWorld() {