mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-19 14:59:25 +00:00
5b9ba51b8b
Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@b3709b1 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: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
|
|
Date: Thu, 11 Jul 2024 19:15:23 +0300
|
|
Subject: [PATCH] Fix MC-200418
|
|
|
|
Original bug on Mojira: https://bugs.mojang.com/browse/MC-200418
|
|
Took here: https://github.com/Winds-Studio/Leaf/blob/ver/1.21/patches/server/0081-Fix-MC-200418.patch
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
|
|
index 5ead916772c21d8db98e389984d531aae7f59700..e2fe70e4a1eb6a1cb4e8f11ac8138e08bd081c68 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
|
|
@@ -334,6 +334,11 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
|
|
world.levelEvent((Player) null, 1027, this.blockPosition(), 0);
|
|
}
|
|
|
|
+ // DivineMC start - Fix MC-200418
|
|
+ if (entityvillager.isPassenger() && entityvillager.getVehicle() instanceof net.minecraft.world.entity.animal.Chicken && entityvillager.isBaby()) {
|
|
+ entityvillager.removeVehicle();
|
|
+ }
|
|
+ // DivineMC end
|
|
}
|
|
}
|
|
|