summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authorblablubbabc <lukas@wirsindwir.de>2018-08-01 08:49:53 +1000
committermd_5 <git@md-5.net>2018-08-01 08:50:08 +1000
commita0c7bcf02a2fb8ca6fc64a76b33be9fab2c5c099 (patch)
tree0aaeaec1f0123bae41a8838b32f3d9e97306361d /nms-patches
parenta3b7e3433a01a5266c774912d71cb8451dcf7daf (diff)
downloadcraftbukkit-a0c7bcf02a2fb8ca6fc64a76b33be9fab2c5c099.tar
craftbukkit-a0c7bcf02a2fb8ca6fc64a76b33be9fab2c5c099.tar.gz
craftbukkit-a0c7bcf02a2fb8ca6fc64a76b33be9fab2c5c099.tar.lz
craftbukkit-a0c7bcf02a2fb8ca6fc64a76b33be9fab2c5c099.tar.xz
craftbukkit-a0c7bcf02a2fb8ca6fc64a76b33be9fab2c5c099.zip
Fix merchant inventories with custom titles
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/InventoryMerchant.patch9
1 files changed, 9 insertions, 0 deletions
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 @@
}