summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nms-patches/EntityVillager.patch9
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java1
2 files changed, 10 insertions, 0 deletions
diff --git a/nms-patches/EntityVillager.patch b/nms-patches/EntityVillager.patch
index 6cfcdfc5..140034fc 100644
--- a/nms-patches/EntityVillager.patch
+++ b/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/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
index a6ee01ca..e9222580 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
+++ b/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();
}
}