PaperMC/nms-patches/InventoryMerchant.patch

64 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
2018-07-15 02:00:00 +02:00
@@ -2,6 +2,13 @@
2016-11-17 02:41:03 +01:00
import java.util.Iterator;
2018-07-15 02:00:00 +02:00
import javax.annotation.Nullable;
+// CraftBukkit start
+import java.util.List;
2016-02-29 22:32:46 +01:00
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
2019-04-23 04:00:00 +02:00
+import org.bukkit.craftbukkit.entity.CraftAbstractVillager;
+import org.bukkit.entity.HumanEntity;
+// CraftBukkit end
2016-05-10 13:47:39 +02:00
public class InventoryMerchant implements IInventory {
@@ -12,6 +19,46 @@
2016-05-10 13:47:39 +02:00
public int selectedIndex;
2019-04-23 04:00:00 +02:00
private int e;
2016-05-10 13:47:39 +02:00
+ // 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);
+ merchant.setTradingPlayer((EntityHuman) null); // SPIGOT-4860
+ }
+
+ public List<HumanEntity> getViewers() {
+ return transaction;
+ }
+
2019-04-23 04:00:00 +02:00
+ @Override
+ public int getMaxStackSize() {
+ return maxStack;
+ }
+
+ public void setMaxStackSize(int i) {
+ maxStack = i;
+ }
+
+ public org.bukkit.inventory.InventoryHolder getOwner() {
+ return (merchant instanceof EntityVillagerAbstract) ? (CraftAbstractVillager) ((EntityVillagerAbstract) 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
+
2019-04-23 04:00:00 +02:00
public InventoryMerchant(IMerchant imerchant) {
2016-11-17 02:41:03 +01:00
this.itemsInSlots = NonNullList.a(3, ItemStack.a);
2019-04-23 04:00:00 +02:00
this.merchant = imerchant;