mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-09 04:09:54 +01:00
90 lines
4.0 KiB
Diff
90 lines
4.0 KiB
Diff
--- a/net/minecraft/server/EntityVillager.java
|
|
+++ b/net/minecraft/server/EntityVillager.java
|
|
@@ -6,6 +6,14 @@
|
|
import javax.annotation.Nullable;
|
|
import org.apache.logging.log4j.LogManager;
|
|
import org.apache.logging.log4j.Logger;
|
|
+// CraftBukkit start
|
|
+import org.bukkit.Bukkit;
|
|
+import org.bukkit.craftbukkit.entity.CraftVillager;
|
|
+import org.bukkit.craftbukkit.inventory.CraftMerchantRecipe;
|
|
+import org.bukkit.entity.Villager;
|
|
+import org.bukkit.event.entity.VillagerAcquireTradeEvent;
|
|
+import org.bukkit.event.entity.VillagerReplenishTradeEvent;
|
|
+// CraftBukkit end
|
|
|
|
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) {
|
|
super(world);
|
|
- this.inventory = new InventorySubcontainer("Items", false, 8);
|
|
+ this.inventory = new InventorySubcontainer("Items", false, 8, (CraftVillager) this.getBukkitEntity()); // CraftBukkit add argument
|
|
this.setProfession(i);
|
|
this.setSize(0.6F, 1.95F);
|
|
((Navigation) this.getNavigation()).a(true);
|
|
@@ -119,7 +127,14 @@
|
|
MerchantRecipe merchantrecipe = (MerchantRecipe) iterator.next();
|
|
|
|
if (merchantrecipe.h()) {
|
|
- merchantrecipe.a(this.random.nextInt(6) + this.random.nextInt(6) + 2);
|
|
+ // CraftBukkit start
|
|
+ int bonus = this.random.nextInt(6) + this.random.nextInt(6) + 2;
|
|
+ VillagerReplenishTradeEvent event = new VillagerReplenishTradeEvent((Villager) this.getBukkitEntity(), merchantrecipe.asBukkit(), bonus);
|
|
+ Bukkit.getPluginManager().callEvent(event);
|
|
+ if (!event.isCancelled()) {
|
|
+ merchantrecipe.a(event.getBonus());
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
}
|
|
|
|
@@ -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];
|
|
|
|
- entityvillager_imerchantrecipeoption.a(this, this.trades, this.random);
|
|
+ // CraftBukkit start
|
|
+ // this is a hack. this must be done because otherwise, if
|
|
+ // mojang adds a new type of villager merchant option, it will need to
|
|
+ // have event handling added manually. this is better than having to do that.
|
|
+ MerchantRecipeList list = new MerchantRecipeList();
|
|
+ entityvillager_imerchantrecipeoption.a(this, list, this.random);
|
|
+ for (MerchantRecipe recipe : list) {
|
|
+ VillagerAcquireTradeEvent event = new VillagerAcquireTradeEvent((Villager) getBukkitEntity(), recipe.asBukkit());
|
|
+ Bukkit.getPluginManager().callEvent(event);
|
|
+ if (!event.isCancelled()) {
|
|
+ this.trades.add(CraftMerchantRecipe.fromBukkit(event.getRecipe()).toMinecraft());
|
|
+ }
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
}
|
|
|