OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 07:48:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-4310: Reset villager career level with trades

Browse source
This commit is contained in:
md_5 2018-08-27 07:00:56 +10:00
parent 6dee81a6f7
commit 479ec05e3b
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nms-patches/EntityVillager.patch
View file

@ -15,6 +15,15 @@
public class EntityVillager extends EntityAgeable implements NPC, IMerchant { 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 @@ @@ -38,7 +46,7 @@
public EntityVillager(World world, int i) { public EntityVillager(World world, int i) {

1
src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
View file

@ -70,6 +70,7 @@ public class CraftVillager extends CraftAgeable implements Villager, InventoryHo
if (resetTrades) { if (resetTrades) {
getHandle().trades = null; getHandle().trades = null;
getHandle().bQ = 0; // SPIGOT-4310
getHandle().populateTrades(); getHandle().populateTrades();
} }
} }