Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@f7124df Fix recursive chunk loading in chunk unload event
PaperMC/Paper@8b558d9 Apply entity tracker desync patch
PaperMC/Paper@a594d18 Fix entities not being visible to clients when teleporting
PaperMC/Paper@f250ec0 Increment ChunkHolderManager current tick
PaperMC/Paper@7bd22b1 Optimise entity tracker
PaperMC/Paper@90ae1dc Port collision optimisation patch from Moonrise
PaperMC/Paper@821081d Drop unapplied patches
PaperMC/Paper@1d0fcb5 Port lag compensation patch
PaperMC/Paper@0e02aa5 Port watchdog detail patch
PaperMC/Paper@c6e9579 Fix explosions calculation getting stuck (#11061)
PaperMC/Paper@2773dc4 Add light block to indestructible block list
PaperMC/Paper@70ff1ec Only skip damage tick if damage is unmodified zero (#11058)
This commit is contained in:
granny
2024-07-12 03:56:05 -07:00
parent b3709b1f4d
commit 5e70800f80
49 changed files with 263 additions and 246 deletions

View File

@@ -268,7 +268,7 @@ index a14db0ec9ebcde24d5b7340a08002eddc8ebd421..fb429dce94bfad6aba3c63a4694e7c8d
protected void registerGoals() {
this.eatBlockGoal = new EatBlockGoal(this);
diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
index 60736df3b726c6a408c8b6aae6f0bd3e3efd32b0..751fe2afdea34a6776d428675c3924112668d530 100644
index 41d47141bfd77b17cbf163bffdfeb002135035ca..8f02a1b39db0581efb8ccd2c889f048bfd7b3e04 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
@@ -110,6 +110,11 @@ public class Turtle extends Animal {
@@ -281,7 +281,7 @@ index 60736df3b726c6a408c8b6aae6f0bd3e3efd32b0..751fe2afdea34a6776d428675c392411
+ }
+
public void setHomePos(BlockPos pos) {
this.entityData.set(Turtle.HOME_POS, pos.immutable()); // Paper - called with mutablepos...
this.entityData.set(Turtle.HOME_POS, pos);
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
index 133aa48278ca51c74b5eb8900202e7076119e445..0e862d4f044683ec46c32929310641af5c1cc2d0 100644