summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authorSenmori <thesenmori@gmail.com>2017-12-31 21:21:03 +1100
committermd_5 <git@md-5.net>2017-12-31 21:21:03 +1100
commit950006003c4f57ca4ac61280c93fdc5ba747ce20 (patch)
tree9f3e75bbfe36b772ce52fccd37f49ee8b8a48268 /nms-patches
parente1fb9cb640b9c4df167d3eb988aaa69ea533fc89 (diff)
downloadcraftbukkit-950006003c4f57ca4ac61280c93fdc5ba747ce20.tar
craftbukkit-950006003c4f57ca4ac61280c93fdc5ba747ce20.tar.gz
craftbukkit-950006003c4f57ca4ac61280c93fdc5ba747ce20.tar.lz
craftbukkit-950006003c4f57ca4ac61280c93fdc5ba747ce20.tar.xz
craftbukkit-950006003c4f57ca4ac61280c93fdc5ba747ce20.zip
SPIGOT-355: API for Villager careers
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/EntityVillager.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/nms-patches/EntityVillager.patch b/nms-patches/EntityVillager.patch
index fa7f585a..8693d0ff 100644
--- a/nms-patches/EntityVillager.patch
+++ b/nms-patches/EntityVillager.patch
@@ -15,6 +15,22 @@
public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
+@@ -18,13 +26,13 @@
+ @Nullable
+ private EntityHuman tradingPlayer;
+ @Nullable
+- private MerchantRecipeList trades;
++ public MerchantRecipeList trades; // PAIL private -> public
+ private int bF;
+ private boolean bG;
+ private boolean bH;
+ public int riches;
+ private String bJ;
+- private int bK;
++ public int bK; // PAIL private -> public // PAIL rename careerID
+ private int bL;
+ private boolean bM;
+ private boolean bN;
@@ -37,7 +45,7 @@
public EntityVillager(World world, int i) {
@@ -40,6 +56,15 @@
}
}
+@@ -432,7 +447,7 @@
+ return this.trades;
+ }
+
+- private void dx() {
++ public void dx() { // CraftBukkit private -> public // PAIL rename populateTrades
+ EntityVillager.IMerchantRecipeOption[][][] aentityvillager_imerchantrecipeoption = EntityVillager.bP[this.getProfession()];
+
+ if (this.bK != 0 && this.bL != 0) {
@@ -460,7 +475,20 @@
for (int l = 0; l < k; ++l) {
EntityVillager.IMerchantRecipeOption entityvillager_imerchantrecipeoption = aentityvillager_imerchantrecipeoption3[l];