Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@b89e6a0 Readd more patches
PaperMC/Paper@be8ac7a Fix respawn error due to null location
PaperMC/Paper@8d91b85 Prioritize vanilla commands in function parsing (#11011)
This commit is contained in:
granny
2024-07-04 21:48:11 -07:00
parent 8b987b1110
commit de2e7a7967
37 changed files with 173 additions and 190 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add canSaveToDisk to Entity
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 44149646438b03b85c300e9fbb5982c998fa32de..a90bee7735b4b12371a28e57c6cc4ab88e0c9f9c 100644
index 04c6736d792f9341e21ff76f0ee8efaf375f6af3..4293e514579b1f4e392e46955d0d535781e9c2b2 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -530,6 +530,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -531,6 +531,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
return this.getIndirectPassengersStream().anyMatch((entity) -> entity instanceof Player);
}
// Paper end - rewrite chunk system