Paper/nms-patches/InventoryMerchant.patch

67 lines
1.9 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/InventoryMerchant.java
+++ b/net/minecraft/server/InventoryMerchant.java
2016-05-10 13:47:39 +02:00
@@ -1,6 +1,13 @@
package net.minecraft.server;
2016-11-17 02:41:03 +01:00
import java.util.Iterator;
+// CraftBukkit start
+import java.util.List;
2016-02-29 22:32:46 +01:00
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.entity.CraftVillager;
+import org.bukkit.entity.HumanEntity;
+// CraftBukkit end
2016-05-10 13:47:39 +02:00
public class InventoryMerchant implements IInventory {
2016-05-10 13:47:39 +02:00
@@ -10,6 +17,40 @@
private MerchantRecipe recipe;
2016-05-10 13:47:39 +02:00
public int selectedIndex;
+ // CraftBukkit start - add fields and methods
+ public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
+ private int maxStack = MAX_STACK;
+
2016-11-17 02:41:03 +01:00
+ public List<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 (merchant instanceof EntityVillager) ? (CraftVillager) ((EntityVillager) this.merchant).getBukkitEntity() : null;
+ }
2015-02-26 23:41:06 +01:00
+
2016-02-29 22:32:46 +01:00
+ @Override
+ public Location getLocation() {
+ return (merchant instanceof EntityVillager) ? ((EntityVillager) this.merchant).getBukkitEntity().getLocation() : null;
2016-02-29 22:32:46 +01:00
+ }
+ // CraftBukkit end
2016-05-10 13:47:39 +02:00
+
public InventoryMerchant(EntityHuman entityhuman, IMerchant imerchant) {
2016-11-17 02:41:03 +01:00
this.itemsInSlots = NonNullList.a(3, ItemStack.a);
this.player = entityhuman;
2016-11-17 02:41:03 +01:00
@@ -89,7 +130,7 @@
}
public int getMaxStackSize() {
- return 64;
+ return maxStack; // CraftBukkit
}
public boolean a(EntityHuman entityhuman) {