Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@f6969b6 Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@bb1c0dd Implement tracking range y setting
PaperMC/Paper@9d21a88 Fix tests
PaperMC/Paper@6573d95 update configurate (#9230)
PaperMC/Paper@f36bb59 Fix entity data not updated for firework attached to entity (#9783)
This commit is contained in:
granny
2023-10-04 00:16:25 -07:00
parent fa475bab82
commit 677566eb0a
8 changed files with 24 additions and 24 deletions

View File

@@ -57,7 +57,7 @@ index 469ad6f0d73add7b005217b2ae39b201c7679a27..ede13fe38fb97b94180ea8557d8a45d2
return checkMonsterSpawnRules(type, world, spawnReason, pos, random) && (spawnReason == MobSpawnType.SPAWNER || world.canSeeSky(pos));
}
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
index 004de1b76734d9015537fa4885656101d2f07efa..1efcafd736c1dbd057d5bfe7abbfcb1fb2d6f7b3 100644
index 56f9d91ba48c501fbcdbb959f683ce8728a36503..971abbfdff555a569ad54b9db5947c3ec50408d2 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -129,6 +129,18 @@ public class Zombie extends Monster {
@@ -79,7 +79,7 @@ index 004de1b76734d9015537fa4885656101d2f07efa..1efcafd736c1dbd057d5bfe7abbfcb1f
@Override
protected void registerGoals() {
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
@@ -552,19 +564,20 @@ public class Zombie extends Monster {
@@ -544,19 +556,20 @@ public class Zombie extends Monster {
if (object instanceof Zombie.ZombieGroupData) {
Zombie.ZombieGroupData entityzombie_groupdatazombie = (Zombie.ZombieGroupData) object;
@@ -106,7 +106,7 @@ index 004de1b76734d9015537fa4885656101d2f07efa..1efcafd736c1dbd057d5bfe7abbfcb1f
Chicken entitychicken1 = (Chicken) EntityType.CHICKEN.create(this.level());
if (entitychicken1 != null) {
@@ -574,6 +587,7 @@ public class Zombie extends Monster {
@@ -566,6 +579,7 @@ public class Zombie extends Monster {
this.startRiding(entitychicken1);
world.addFreshEntity(entitychicken1, CreatureSpawnEvent.SpawnReason.MOUNT); // CraftBukkit
}