--- a/net/minecraft/server/InventoryMerchant.java +++ b/net/minecraft/server/InventoryMerchant.java @@ -1,6 +1,13 @@ package net.minecraft.server; import javax.annotation.Nullable; +// CraftBukkit start +import java.util.List; +import org.bukkit.Location; +import org.bukkit.craftbukkit.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.entity.CraftVillager; +import org.bukkit.entity.HumanEntity; +// CraftBukkit end public class InventoryMerchant implements IInventory { @@ -10,6 +17,40 @@ private MerchantRecipe recipe; public int selectedIndex; + // CraftBukkit start - add fields and methods + public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>(); + private int maxStack = MAX_STACK; + + public ItemStack[] getContents() { + return this.itemsInSlots; + } + + public void onOpen(CraftHumanEntity who) { + transaction.add(who); + } + + public void onClose(CraftHumanEntity who) { + transaction.remove(who); + } + + public List<HumanEntity> getViewers() { + return transaction; + } + + public void setMaxStackSize(int i) { + maxStack = i; + } + + public org.bukkit.inventory.InventoryHolder getOwner() { + return (CraftVillager) ((EntityVillager) this.merchant).getBukkitEntity(); + } + + @Override + public Location getLocation() { + return ((EntityVillager) this.merchant).getBukkitEntity().getLocation(); + } + // CraftBukkit end + public InventoryMerchant(EntityHuman entityhuman, IMerchant imerchant) { this.player = entityhuman; this.merchant = imerchant; @@ -73,7 +114,7 @@ } public int getMaxStackSize() { - return 64; + return maxStack; // CraftBukkit } public boolean a(EntityHuman entityhuman) {