3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-28 17:10:10 +01:00
Paper/nms-patches/InventoryMerchant.patch

68 Zeilen
1.9 KiB
Diff

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/InventoryMerchant.java
+++ b/net/minecraft/server/InventoryMerchant.java
2016-02-29 22:32:46 +01:00
@@ -1,12 +1,54 @@
package net.minecraft.server;
+// 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
+
public class InventoryMerchant implements IInventory {
private final IMerchant merchant;
2016-02-29 22:32:46 +01:00
private ItemStack[] itemsInSlots = new ItemStack[3];
private final EntityHuman player;
private MerchantRecipe recipe;
2016-02-29 22:32:46 +01:00
- 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;
+
+ 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();
+ }
2015-02-26 23:41:06 +01:00
+
2016-02-29 22:32:46 +01:00
+ @Override
+ public Location getLocation() {
+ return ((EntityVillager) this.merchant).getBukkitEntity().getLocation();
+ }
+ // CraftBukkit end
public InventoryMerchant(EntityHuman entityhuman, IMerchant imerchant) {
this.player = entityhuman;
2016-02-29 22:32:46 +01:00
@@ -68,7 +110,7 @@
}
public int getMaxStackSize() {
- return 64;
+ return maxStack; // CraftBukkit
}
public boolean a(EntityHuman entityhuman) {