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 609c4b44569dbb49578d7dc319b88b8b3a806f13..4455d801ded793ff12425daddb6092890daf28e9 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);