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

@@ -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 51904af3addaf816fecd55a42d2dad2e67aa03f7..5e34a304b0066b238a9381bd35d5f499db54b54b 100644
index c42fa1b5758fee518edb72aefd683d646b2dff3e..e2e0570e1b866ecb2080013df32071fc4d46290f 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 51904af3addaf816fecd55a42d2dad2e67aa03f7..5e34a304b0066b238a9381bd35d5f499
}
// CraftBukkit start
@@ -3619,6 +3626,34 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3635,6 +3642,34 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().drown(), 1.0F);
}