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] Totems work in inventory
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index bfb6f5b07ac201cd99eb39bcdbd02353dd4b810c..13d29b9c6f683f716cbeb965bab96bc257b9e9e0 100644
index 995cb702af3e3f22d836604db98b333a4939de46..e38c137fbe90f0d024a87031a5610aacbca56c70 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1652,6 +1652,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1651,6 +1651,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
}