From a0c7bcf02a2fb8ca6fc64a76b33be9fab2c5c099 Mon Sep 17 00:00:00 2001
From: blablubbabc <lukas@wirsindwir.de>
Date: Wed, 1 Aug 2018 08:49:53 +1000
Subject: Fix merchant inventories with custom titles

---
 nms-patches/InventoryMerchant.patch | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'nms-patches')

diff --git a/nms-patches/InventoryMerchant.patch b/nms-patches/InventoryMerchant.patch
index 30897b1d..f46377c3 100644
--- a/nms-patches/InventoryMerchant.patch
+++ b/nms-patches/InventoryMerchant.patch
@@ -55,6 +55,15 @@
      public InventoryMerchant(EntityHuman entityhuman, IMerchant imerchant) {
          this.itemsInSlots = NonNullList.a(3, ItemStack.a);
          this.player = entityhuman;
+@@ -78,7 +119,7 @@
+     }
+ 
+     public IChatBaseComponent getDisplayName() {
+-        return new ChatMessage("mob.villager", new Object[0]);
++        return merchant.getScoreboardDisplayName(); // CraftBukkit
+     }
+ 
+     public boolean hasCustomName() {
 @@ -91,7 +132,7 @@
      }
  
-- 
cgit v1.2.3