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

@@ -33,7 +33,7 @@ index 13afec25f9d08401d9c5adee211e422159f2ba02..0d4eb7fb3a62db8691d49d6963aec7ca
this.id = Entity.ENTITY_COUNTER.incrementAndGet();
this.passengers = ImmutableList.of();
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 9ccdd607d23e00974b6a44f656885ee6fd4d39ad..686ce519b70e2193e207aca16f4ef15cb36840b5 100644
index 51904af3addaf816fecd55a42d2dad2e67aa03f7..5e34a304b0066b238a9381bd35d5f499db54b54b 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -286,6 +286,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -64,7 +64,7 @@ index 9ccdd607d23e00974b6a44f656885ee6fd4d39ad..686ce519b70e2193e207aca16f4ef15c
}
// CraftBukkit start
@@ -3620,6 +3627,34 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3619,6 +3626,34 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().drown(), 1.0F);
}