From a07e783a690c63e96e3394544cb0173746a33a3f Mon Sep 17 00:00:00 2001 From: VendoAU Date: Mon, 14 Jun 2021 19:13:37 +1000 Subject: [PATCH] #865: Implement Villager#shakeHead --- .../net/minecraft/world/entity/npc/EntityVillager.patch | 9 +++++++++ .../org/bukkit/craftbukkit/entity/CraftVillager.java | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/nms-patches/net/minecraft/world/entity/npc/EntityVillager.patch b/nms-patches/net/minecraft/world/entity/npc/EntityVillager.patch index 0e4f1790e..181a4174d 100644 --- a/nms-patches/net/minecraft/world/entity/npc/EntityVillager.patch +++ b/nms-patches/net/minecraft/world/entity/npc/EntityVillager.patch @@ -51,6 +51,15 @@ } } +@@ -302,7 +310,7 @@ + } + } + +- private void fT() { ++ public void fT() { + this.t(40); + if (!this.level.isClientSide()) { + this.playSound(SoundEffects.VILLAGER_NO, this.getSoundVolume(), this.ep()); @@ -444,7 +452,14 @@ while (iterator.hasNext()) { MerchantRecipe merchantrecipe = (MerchantRecipe) iterator.next(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java index 8f92d79b1..b987ba3df 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java @@ -107,6 +107,11 @@ public class CraftVillager extends CraftAbstractVillager implements Villager { getHandle().entityWakeup(); } + @Override + public void shakeHead() { + getHandle().fT(); // PAIL rename shakeHead + } + public static Profession nmsToBukkitProfession(VillagerProfession nms) { return Profession.valueOf(IRegistry.VILLAGER_PROFESSION.getKey(nms).getKey().toUpperCase(Locale.ROOT)); }