mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-27 02:49:19 +00:00
8c1ad8d658
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@b5066268 Remove unused light queue size option (#12201) PaperMC/Paper@1d5e5a57 Document replacement for Skull owner profile methods (#12195) PaperMC/Paper@8de7e356 Add null check to level ref in Entity constructor (#12218) PaperMC/Paper@a866e366 Fix MenuType.SMITHING JavaDocs (#12226) PaperMC/Paper@5538d24d Fix "DEFAULT" SpawnReason of fish spawned by bucket (#12227) PaperMC/Paper@0a4eb8f3 Send the pong response packet immediately. This packet is similar to the keep alive packet and is processed async. (#12242) PaperMC/Paper@7a3d0c4e Fix recipe being always null in PrepareItemCraftEvent from the api (#12237) PaperMC/Paper@a6ce734f Fix zombie villager not dropping item once cured (#12230) PaperMC/Paper@ce300162 Skip alpha channel for custom model data component (#12205) Gale Changes: Dreeam-qwq/Gale@ef499e4c Updated Upstream (Paper)
25 lines
1.3 KiB
Diff
25 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com>
|
|
Date: Sun, 7 Jul 2024 01:29:57 +0800
|
|
Subject: [PATCH] Fix-MC-200418
|
|
|
|
Related MC issue: https://bugs.mojang.com/browse/MC-200418
|
|
|
|
diff --git a/net/minecraft/world/entity/monster/ZombieVillager.java b/net/minecraft/world/entity/monster/ZombieVillager.java
|
|
index cb0e000c5b8636296c7d7474d0947c75f41b6058..d4b6c93f9f0e109be300164c4fd9167aba2d951c 100644
|
|
--- a/net/minecraft/world/entity/monster/ZombieVillager.java
|
|
+++ b/net/minecraft/world/entity/monster/ZombieVillager.java
|
|
@@ -320,6 +320,12 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
|
|
if (!this.isSilent()) {
|
|
serverLevel.levelEvent(null, 1027, this.blockPosition(), 0);
|
|
}
|
|
+
|
|
+ // Leaf start - Fix MC-200418
|
|
+ if (villager.isPassenger() && villager.getVehicle() instanceof net.minecraft.world.entity.animal.Chicken && villager.isBaby()) {
|
|
+ villager.removeVehicle();
|
|
+ }
|
|
+ // Leaf end - Fix MC-200418
|
|
// CraftBukkit start
|
|
}, org.bukkit.event.entity.EntityTransformEvent.TransformReason.CURED, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CURED // CraftBukkit
|
|
);
|