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

@@ -34,7 +34,7 @@ index 75c278b67ad2b78766efd8f89c4c2ca7eb7cdcb2..dc99e7f0e6f173c1313c0d5e9ea5dd6b
protected ParticleOptions getInkParticle() {
return ParticleTypes.GLOW_SQUID_INK;
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index e6b83abce3bbd2f5e89d02415bcc6b1a1b0b5da9..91f8f6c918ab5bc8a456b924b9b02b03905841aa 100644
index 4f6ec3e2dcdb4a316cf58a9044a8cacdd982bba3..9330c6a55eb5503f7d58d94424491f46416392f4 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -288,6 +288,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -78,7 +78,7 @@ index 2ee2097ebf7753d63a99fdf492da374849a345eb..41ac8d2cb5424aecb58158122009b5dc
public void readAdditionalSaveData(CompoundTag nbt) {
super.readAdditionalSaveData(nbt);
diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
index 706ae64b894709601dccfb621d3c215f073e98e9..e7f95639a442cf602fef0ed7aec0f5f96aa6fd92 100644
index ef056d4431388a49b24f63524ee246e506d80540..ee9a12a0285f43535b377e5aea2c3e9e5f64b496 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
@@ -471,6 +471,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -1353,7 +1353,7 @@ index dc29e875c1e184c1c4553c127bb8c86dddf8c5ab..1d862dd019b2d024f61cfc8956430d18
protected Brain.Provider<Zoglin> brainProvider() {
return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
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 fb4b3bb082e299723613a28831ff8f9c2eae7ffd..004de1b76734d9015537fa4885656101d2f07efa 100644
index 7be0c7776608582adf556b36dcfe289465490ecd..56f9d91ba48c501fbcdbb959f683ce8728a36503 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -124,6 +124,11 @@ public class Zombie extends Monster {
@@ -1368,7 +1368,7 @@ index fb4b3bb082e299723613a28831ff8f9c2eae7ffd..004de1b76734d9015537fa4885656101
@Override
protected void registerGoals() {
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
@@ -615,7 +620,7 @@ public class Zombie extends Monster {
@@ -607,7 +612,7 @@ public class Zombie extends Monster {
}
protected void randomizeReinforcementsChance() {