Add TradeSelectEvent

This commit is contained in:
Coleman Yantis
2019-04-28 12:35:28 +10:00
committed by md_5
parent e3df3d5cda
commit ba2e5e7c74
8 changed files with 109 additions and 56 deletions

View File

@@ -1,11 +1,12 @@
--- a/net/minecraft/server/EntityVillagerAbstract.java
+++ b/net/minecraft/server/EntityVillagerAbstract.java
@@ -4,6 +4,12 @@
@@ -4,14 +4,29 @@
import java.util.Iterator;
import java.util.Set;
import javax.annotation.Nullable;
+// CraftBukkit start
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.inventory.CraftMerchant;
+import org.bukkit.craftbukkit.inventory.CraftMerchantRecipe;
+import org.bukkit.entity.AbstractVillager;
+import org.bukkit.event.entity.VillagerAcquireTradeEvent;
@@ -13,7 +14,15 @@
public abstract class EntityVillagerAbstract extends EntityAgeable implements NPC, IMerchant {
@@ -11,7 +17,7 @@
+ // CraftBukkit start
+ private CraftMerchant craftMerchant;
+
+ @Override
+ public CraftMerchant getCraftMerchant() {
+ return (craftMerchant == null) ? craftMerchant = new CraftMerchant(this) : craftMerchant;
+ }
+ // CraftBukkit end
@Nullable
private EntityHuman tradingPlayer;
@Nullable
protected MerchantRecipeList trades;
@@ -22,7 +31,7 @@
private int bC;
public EntityVillagerAbstract(EntityTypes<? extends EntityVillagerAbstract> entitytypes, World world) {
@@ -198,7 +204,16 @@
@@ -198,7 +213,16 @@
MerchantRecipe merchantrecipe = villagertrades_imerchantrecipeoption.a(this, this.random);
if (merchantrecipe != null) {