Upstream Paper's upgrade to vineflower 12.0.0 (#1782)

This commit is contained in:
granny
2026-05-31 16:42:41 -07:00
committed by GitHub
parent dc4a255969
commit 3fe5edd4b5
116 changed files with 1321 additions and 1333 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable jockey options
diff --git a/net/minecraft/world/entity/monster/zombie/Drowned.java b/net/minecraft/world/entity/monster/zombie/Drowned.java
index 573abf9eae9f5492e4231d663814352f7e046fe2..0f64fe7e15655c63f996106d504ab4d18dac4a1c 100644
index 36184895787abaf54072fbae6ade286076b6f3c8..8102352e1b59608b19a68f4e5080180c9a3999b5 100644
--- a/net/minecraft/world/entity/monster/zombie/Drowned.java
+++ b/net/minecraft/world/entity/monster/zombie/Drowned.java
@@ -116,6 +116,23 @@ public class Drowned extends Zombie implements RangedAttackMob {
@@ -61,10 +61,10 @@ index 1c985585a2da43e59bb5b9ebd742e1e31b2cda29..c3f2d9ab49eb501f26939387624f3262
public boolean isSunSensitive() {
return false;
diff --git a/net/minecraft/world/entity/monster/zombie/Zombie.java b/net/minecraft/world/entity/monster/zombie/Zombie.java
index 1fbebd0cd04182679400ef3c33bf0730c01bc645..bf94d8e9512eeb294914c748be091f6565cca676 100644
index 875993036ebd0f8a08d28f0e04f0c82b294e3ff5..4b7a00ae57526db73dda9f92a31a95c97b0bc41c 100644
--- a/net/minecraft/world/entity/monster/zombie/Zombie.java
+++ b/net/minecraft/world/entity/monster/zombie/Zombie.java
@@ -138,6 +138,20 @@ public class Zombie extends Monster {
@@ -137,6 +137,20 @@ public class Zombie extends Monster {
}
// Purpur end - Configurable entity base attributes
@@ -85,7 +85,7 @@ index 1fbebd0cd04182679400ef3c33bf0730c01bc645..bf94d8e9512eeb294914c748be091f65
@Override
protected void registerGoals() {
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
@@ -550,19 +564,18 @@ public class Zombie extends Monster {
@@ -547,19 +561,18 @@ public class Zombie extends Monster {
}
if (groupData instanceof Zombie.ZombieGroupData zombieData) {
@@ -111,7 +111,7 @@ index 1fbebd0cd04182679400ef3c33bf0730c01bc645..bf94d8e9512eeb294914c748be091f65
Chicken chicken = EntityType.CHICKEN.create(this.level(), EntitySpawnReason.JOCKEY);
if (chicken != null) {
chicken.snapTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), 0.0F);
@@ -571,6 +584,7 @@ public class Zombie extends Monster {
@@ -568,6 +581,7 @@ public class Zombie extends Monster {
this.startRiding(chicken, false, false);
level.addFreshEntity(chicken, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.MOUNT); // CraftBukkit
}