diff options
Diffstat (limited to 'nms-patches/InventoryMerchant.patch')
| -rw-r--r-- | nms-patches/InventoryMerchant.patch | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/nms-patches/InventoryMerchant.patch b/nms-patches/InventoryMerchant.patch index 83227eb9..26027d36 100644 --- a/nms-patches/InventoryMerchant.patch +++ b/nms-patches/InventoryMerchant.patch @@ -1,10 +1,11 @@ --- a/net/minecraft/server/InventoryMerchant.java +++ b/net/minecraft/server/InventoryMerchant.java -@@ -1,5 +1,12 @@ +@@ -1,12 +1,54 @@ package net.minecraft.server; +// 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; @@ -13,10 +14,12 @@ public class InventoryMerchant implements IInventory { private final IMerchant merchant; -@@ -8,6 +15,35 @@ + private ItemStack[] itemsInSlots = new ItemStack[3]; + private final EntityHuman player; private MerchantRecipe recipe; - private int e; - +- private int e; ++ public int e; // PAIL: private -> public, selectedIndex ++ + // CraftBukkit start - add fields and methods + public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>(); + private int maxStack = MAX_STACK; @@ -44,12 +47,16 @@ + public org.bukkit.inventory.InventoryHolder getOwner() { + return (CraftVillager) ((EntityVillager) this.merchant).getBukkitEntity(); + } -+ // CraftBukkit end + ++ @Override ++ public Location getLocation() { ++ return ((EntityVillager) this.merchant).getBukkitEntity().getLocation(); ++ } ++ // CraftBukkit end + public InventoryMerchant(EntityHuman entityhuman, IMerchant imerchant) { this.player = entityhuman; - this.merchant = imerchant; -@@ -94,7 +130,7 @@ +@@ -68,7 +110,7 @@ } public int getMaxStackSize() { |