summaryrefslogtreecommitdiffstats
path: root/nms-patches/InventoryMerchant.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/InventoryMerchant.patch')
-rw-r--r--nms-patches/InventoryMerchant.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/nms-patches/InventoryMerchant.patch b/nms-patches/InventoryMerchant.patch
index 07f38542..f55d0058 100644
--- a/nms-patches/InventoryMerchant.patch
+++ b/nms-patches/InventoryMerchant.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde/net/minecraft/server/InventoryMerchant.java 2015-02-06 20:41:38.537609199 +1100
-+++ src/main/java/net/minecraft/server/InventoryMerchant.java 2015-02-06 20:41:38.537609199 +1100
+--- /home/matt/mc-dev-private//net/minecraft/server/InventoryMerchant.java 2015-02-26 22:40:22.783608137 +0000
++++ src/main/java/net/minecraft/server/InventoryMerchant.java 2015-02-26 22:40:22.783608137 +0000
@@ -1,5 +1,12 @@
package net.minecraft.server;
@@ -44,8 +44,8 @@
+ public org.bukkit.inventory.InventoryHolder getOwner() {
+ return (CraftVillager) ((EntityVillager) this.merchant).getBukkitEntity();
+ }
-+ // CraftBukkit end
-+
++ // CraftBukkit end
++
public InventoryMerchant(EntityHuman entityhuman, IMerchant imerchant) {
this.player = entityhuman;
this.merchant = imerchant;