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] Implement elytra settings
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index c34aa707c306c52c28e6168218ef0177fc9ef624..e503b9e82ab62652d959b2e0c7d7738706222468 100644
index a84f45e930751ffbaa60bae47654e50965c44996..43d3bed18fe5d14977cb5ea718f349ef6523e8dd 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3598,7 +3598,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3597,7 +3597,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
int j = i / 10;
if (j % 2 == 0) {