diff options
| author | md_5 <git@md-5.net> | 2016-11-22 10:53:36 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-11-22 10:53:36 +1100 |
| commit | 7359112e8c758c412f99e007c5a7689de94197f3 (patch) | |
| tree | a909d8e91bbcaa23217c9d145ca022adf1c9380d | |
| parent | 6220b5c542acaabf60cf46e7c4d34943688d11bb (diff) | |
| download | craftbukkit-7359112e8c758c412f99e007c5a7689de94197f3.tar craftbukkit-7359112e8c758c412f99e007c5a7689de94197f3.tar.gz craftbukkit-7359112e8c758c412f99e007c5a7689de94197f3.tar.lz craftbukkit-7359112e8c758c412f99e007c5a7689de94197f3.tar.xz craftbukkit-7359112e8c758c412f99e007c5a7689de94197f3.zip | |
Implement default title for custom merchants
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftServer.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 |