Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@1e035f3 Only attempt to find spawn position if there isn't a fixed spawn position set (#11682)
PaperMC/Paper@0f90942 Fix non-null initialisation of context collision shape
PaperMC/Paper@4bc80b8 Do not break when PlayerNaturallySpawnCreaturesEvent is cancelled
PaperMC/Paper@ae80a25 Properly handle large values of spawnChunkRadius
PaperMC/Paper@c2294d7 Fix several off-by-one errors in view distance calculations
PaperMC/Paper@da71382 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11702)
This commit is contained in:
granny
2024-12-03 20:14:10 -08:00
parent 03062a856e
commit 0493ac329f
22 changed files with 64 additions and 63 deletions

View File

@@ -1077,10 +1077,10 @@ index 4cd470db5a427e0c0bec0fe2a7c7307cac47b39b..8c3271dcc8c9aa58e2e007eba282c11e
public void setPersistentAngerTarget(@Nullable UUID angryAt) {
this.persistentAngerTarget = angryAt;
diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
index c01813b752ee2d23062806cf14b586807cc056d3..9550fd212bdf53a566940a42d85cc3f8a729b20b 100644
index 1103274ba096b0cab3c89f0bdfeba15f8954a0de..6144613e834236ec0ebb12872ef9e47255b76b5b 100644
--- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
@@ -130,6 +130,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
@@ -109,6 +109,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
return this.level().purpurConfig.hoglinTakeDamageFromWater;
}