From 7359112e8c758c412f99e007c5a7689de94197f3 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 22 Nov 2016 10:53:36 +1100
Subject: Implement default title for custom merchants

---
 src/main/java/org/bukkit/craftbukkit/CraftServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java')

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b3de034a..a838dfe2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1484,7 +1484,7 @@ public final class CraftServer implements Server {
 
     @Override
     public Merchant createMerchant(String title) {
-        return new CraftMerchantCustom(title);
+        return new CraftMerchantCustom(title == null ? InventoryType.MERCHANT.getDefaultTitle() : title);
     }
 
     @Override
-- 
cgit v1.2.3