From 58e0aff97d803390d5e033fa7f44cc219659d6a1 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 7 Oct 2019 00:15:37 -0500 Subject: [PATCH] Add API for Villager#resetOffers() --- .../java/net/minecraft/server/EntityVillagerAbstract.java | 8 ++++++++ .../java/org/bukkit/craftbukkit/entity/CraftVillager.java | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java index f161ccb979..c074d33723 100644 --- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java +++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java @@ -72,6 +72,13 @@ public abstract class EntityVillagerAbstract extends EntityAgeable implements NP return this.tradingPlayer != null; } + // Purpur start + public void resetOffers() { + this.trades = new MerchantRecipeList(); + this.updateTrades(); + } + // Purpur end + @Override public MerchantRecipeList getOffers() { if (this.trades == null) { @@ -213,6 +220,7 @@ public abstract class EntityVillagerAbstract extends EntityAgeable implements NP return this.world; } + protected void updateTrades() { eh(); } // Purpur protected abstract void eh(); protected void a(MerchantRecipeList merchantrecipelist, VillagerTrades.IMerchantRecipeOption[] avillagertrades_imerchantrecipeoption, int i) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java index f291a8d754..0cd358236e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java @@ -112,4 +112,11 @@ public class CraftVillager extends CraftAbstractVillager implements Villager { public static VillagerProfession bukkitToNmsProfession(Profession bukkit) { return IRegistry.VILLAGER_PROFESSION.get(CraftNamespacedKey.toMinecraft(bukkit.getKey())); } + + // Purpur start + @Override + public void resetOffers() { + getHandle().resetOffers(); + } + // Purpur end } -- 2.24.0.rc1