1 files changed, 0 insertions, 192 deletions
diff --git a/src/main/java/net/minecraft/server/InventoryMerchant.java b/src/main/java/net/minecraft/server/InventoryMerchant.java
deleted file mode 100644
index b5617b32..00000000
--- a/src/main/java/net/minecraft/server/InventoryMerchant.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package net.minecraft.server;
-
-// CraftBukkit start
-import java.util.List;
-import org.bukkit.craftbukkit.entity.CraftHumanEntity;
-import org.bukkit.entity.HumanEntity;
-// CraftBukkit end
-
-public class InventoryMerchant implements IInventory {
-
-    private final IMerchant merchant;
-    private ItemStack[] itemsInSlots = new ItemStack[3];
-    private final EntityHuman player;
-    private MerchantRecipe recipe;
-    private int e;
-
-    // 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 player.getBukkitEntity();
-    }
-    // CraftBukkit end
-
-    public InventoryMerchant(EntityHuman entityhuman, IMerchant imerchant) {
-        this.player = entityhuman;
-        this.merchant = imerchant;
-    }
-
-    public int getSize() {
-        return this.itemsInSlots.length;
-    }
-
-    public ItemStack getItem(int i) {
-        return this.itemsInSlots[i];
-    }
-
-    public ItemStack splitStack(int i, int j) {
-        if (this.itemsInSlots[i] != null) {
-            ItemStack itemstack;
-
-            if (i == 2) {
-                itemstack = this.itemsInSlots[i];
-                this.itemsInSlots[i] = null;
-                return itemstack;
-            } else if (this.itemsInSlots[i].count <= j) {
-                itemstack = this.itemsInSlots[i];
-                this.itemsInSlots[i] = null;
-                if (this.d(i)) {
-                    this.h();
-                }
-
-                return itemstack;
-            } else {
-                itemstack = this.itemsInSlots[i].a(j);
-                if (this.itemsInSlots[i].count == 0) {
-                    this.itemsInSlots[i] = null;
-                }
-
-                if (this.d(i)) {
-                    this.h();
-                }
-
-                return itemstack;
-            }
-        } else {
-            return null;
-        }
-    }
-
-    private boolean d(int i) {
-        return i == 0 || i == 1;
-    }
-
-    public ItemStack splitWithoutUpdate(int i) {
-        if (this.itemsInSlots[i] != null) {
-            ItemStack itemstack = this.itemsInSlots[i];
-
-            this.itemsInSlots[i] = null;
-            return itemstack;
-        } else {
-            return null;
-        }
-    }
-
-    public void setItem(int i, ItemStack itemstack) {
-        this.itemsInSlots[i] = itemstack;
-        if (itemstack != null && itemstack.count > this.getMaxStackSize()) {
-            itemstack.count = this.getMaxStackSize();
-        }
-
-        if (this.d(i)) {
-            this.h();
-        }
-    }
-
-    public String getInventoryName() {
-        return "mob.villager";
-    }
-
-    public boolean k_() {
-        return false;
-    }
-
-    public int getMaxStackSize() {
-        return maxStack; // CraftBukkit
-    }
-
-    public boolean a(EntityHuman entityhuman) {
-        return this.merchant.b() == entityhuman;
-    }
-
-    public void startOpen() {}
-
-    public void closeContainer() {}
-
-    public boolean b(int i, ItemStack itemstack) {
-        return true;
-    }
-
-    public void update() {
-        this.h();
-    }
-
-    public void h() {
-        this.recipe = null;
-        ItemStack itemstack = this.itemsInSlots[0];
-        ItemStack itemstack1 = this.itemsInSlots[1];
-
-        if (itemstack == null) {
-            itemstack = itemstack1;
-            itemstack1 = null;
-        }
-
-        if (itemstack == null) {
-            this.setItem(2, (ItemStack) null);
-        } else {
-            MerchantRecipeList merchantrecipelist = this.merchant.getOffers(this.player);
-
-            if (merchantrecipelist != null) {
-                MerchantRecipe merchantrecipe = merchantrecipelist.a(itemstack, itemstack1, this.e);
-
-                if (merchantrecipe != null && !merchantrecipe.g()) {
-                    this.recipe = merchantrecipe;
-                    this.setItem(2, merchantrecipe.getBuyItem3().cloneItemStack());
-                } else if (itemstack1 != null) {
-                    merchantrecipe = merchantrecipelist.a(itemstack1, itemstack, this.e);
-                    if (merchantrecipe != null && !merchantrecipe.g()) {
-                        this.recipe = merchantrecipe;
-                        this.setItem(2, merchantrecipe.getBuyItem3().cloneItemStack());
-                    } else {
-                        this.setItem(2, (ItemStack) null);
-                    }
-                } else {
-                    this.setItem(2, (ItemStack) null);
-                }
-            }
-        }
-
-        this.merchant.a_(this.getItem(2));
-    }
-
-    public MerchantRecipe getRecipe() {
-        return this.recipe;
-    }
-
-    public void c(int i) {
-        this.e = i;
-        this.h();
-    }
-}