From 891ea1190716a7e6c1f450938d6f120e19b00742 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Mon, 27 Aug 2018 07:00:56 +1000 Subject: [PATCH] SPIGOT-4310: Reset villager career level with trades By: md_5 --- paper-server/nms-patches/EntityVillager.patch | 9 +++++++++ .../org/bukkit/craftbukkit/entity/CraftVillager.java | 1 + 2 files changed, 10 insertions(+) diff --git a/paper-server/nms-patches/EntityVillager.patch b/paper-server/nms-patches/EntityVillager.patch index 6cfcdfc52..140034fc1 100644 --- a/paper-server/nms-patches/EntityVillager.patch +++ b/paper-server/nms-patches/EntityVillager.patch @@ -15,6 +15,15 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { +@@ -26,7 +34,7 @@ + public int riches; + private String bO; + public int careerId; +- private int bQ; ++ public int bQ; // PAIL private->public + private boolean bR; + private boolean bS; + public final InventorySubcontainer inventory; @@ -38,7 +46,7 @@ public EntityVillager(World world, int i) { diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java index a6ee01ca6..e92225808 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java @@ -70,6 +70,7 @@ public class CraftVillager extends CraftAgeable implements Villager, InventoryHo if (resetTrades) { getHandle().trades = null; + getHandle().bQ = 0; // SPIGOT-4310 getHandle().populateTrades(); } }