From 75e9b00fa46cfd4ed3c23b7d577f56b196860d86 Mon Sep 17 00:00:00 2001 From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com> Date: Mon, 19 Mar 2018 14:55:34 -0400 Subject: [PATCH] Fixed bugs where merchants who dont sell anything cant be loaded. --- .../command/commands/admin/LoadMerchantCommand.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/syncleus/aethermud/command/commands/admin/LoadMerchantCommand.java b/src/main/java/com/syncleus/aethermud/command/commands/admin/LoadMerchantCommand.java index 609c4b44..4455d801 100644 --- a/src/main/java/com/syncleus/aethermud/command/commands/admin/LoadMerchantCommand.java +++ b/src/main/java/com/syncleus/aethermud/command/commands/admin/LoadMerchantCommand.java @@ -100,10 +100,11 @@ public class LoadMerchantCommand extends Command { merchantData.setName(merchant.name); merchantData.setColorName(merchant.colorName); merchantData.setValidTriggers(merchant.validTriggers); - for(MerchantItemForSale item : merchant.merchantItemForSales) { - MerchantItemForSaleData itemData = merchantData.createMerchantItemForSaleData(); - MerchantItemForSaleData.copyMerchantItemForSale(itemData, item); - } + if( merchant.merchantItemForSales != null ) + for(MerchantItemForSale item : merchant.merchantItemForSales) { + MerchantItemForSaleData itemData = merchantData.createMerchantItemForSaleData(); + MerchantItemForSaleData.copyMerchantItemForSale(itemData, item); + } merchantData.setWelcomeMessage(merchant.welcomeMessage); merchantData.setMerchantType(merchant.merchantType); merchantData.setRoomIds(merchant.roomIds); -- GitLab