Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@37df121 Fix BlockState being set to null for damage events (#10252)
This commit is contained in:
granny
2024-02-16 02:07:20 -08:00
parent 770fbe66e0
commit d0e4b7ba9e
5 changed files with 10 additions and 10 deletions

View File

@@ -61,10 +61,10 @@ index 91feb12732564c90656da487664dbc12e55397fc..a2e76fb8431cd4dc0cbf94245086c939
Iterator iterator = this.players.iterator();
diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
index fe9b45bfc3d000956f6de5594bf5732fa0e6bb08..6f1b9cd34a714c02e9800ff2972aa24ad4080842 100644
index 1561b85a45f52a8162f43553f8485bfe084b8f1f..938524dc5b495ad160b9b14219db573e4e7c6a8a 100644
--- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
@@ -169,6 +169,15 @@ public class DamageSource {
@@ -170,6 +170,15 @@ public class DamageSource {
}
}