core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/patches/unapplied/server/0913-Fix-MC-252439.patch

19 lines
1.1 KiB
Diff
Raw Normal View History

Fix MC-252439 (#7994)
2022-06-16 18:23:36 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Noah van der Aa <ndvdaa@gmail.com>
Date: Wed, 15 Jun 2022 22:34:07 +0200
Subject: [PATCH] Fix MC-252439
diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
Updated Upstream (Bukkit) (#8158)
2022-07-21 19:53:04 +00:00
index 05cf30e6572c9bb7e11d71de1cd79df987bf062a..cff0ed9ae6e79f84870343e43574f384dd73ea88 100644
Fix MC-252439 (#7994)
2022-06-16 18:23:36 +00:00
--- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
Add ZombieVillager conversion without entity event (#8111) The ZombieVillager#setConversionTime API method internally calls startConversion which always broadcasts the entity event responsible for playing the respective sound at the beginning of a conversion. This is not always wanted by developers when modifying already converting zombies in particular. This commit expands the ZombieVillager interface with another overload of the setConversionTime method that also takes a simple toggle flag indicating whether or not the entity event should be published to the world.
2022-07-07 21:43:28 +00:00
@@ -266,6 +266,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
Fix MC-252439 (#7994)
2022-06-16 18:23:36 +00:00
entityvillager.setVillagerXp(this.villagerXp);
entityvillager.finalizeSpawn(world, world.getCurrentDifficultyAt(entityvillager.blockPosition()), MobSpawnType.CONVERSION, (SpawnGroupData) null, (CompoundTag) null);
+ entityvillager.refreshBrain(world); // Paper - Fix MC-252439
if (this.conversionStarter != null) {
Player entityhuman = world.getPlayerByUUID(this.conversionStarter);