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

@@ -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 e9d8e80268c8bfa1cac3e1f6b986673605f36d91..515bb0229516da288699af5296273571e8a1aa8b 100644
index 2e71f39a37d251f9d0780484776e0f84073d84e3..298ec8aace088d1817a2b4b8b481b5ebfa73949e 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2616,7 +2616,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -2615,7 +2615,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@Override
protected void onBelowWorld() {