twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-15 20:23:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.9

Browse Source
This commit is contained in:
md_5
2016-03-01 08:32:46 +11:00
parent e1ebe524a7
commit aa008dff0f
305 changed files with 6684 additions and 6105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
nms-patches/InventoryMerchant.patch
View File

@@ -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() {