Skip to content
Snippets Groups Projects
Commit 75e9b00f authored by Jeffrey Phillips Freeman's avatar Jeffrey Phillips Freeman 💥
Browse files

Fixed bugs where merchants who dont sell anything cant be loaded.

parent 31bf3b4a
No related branches found
No related tags found
No related merge requests found
...@@ -100,10 +100,11 @@ public class LoadMerchantCommand extends Command { ...@@ -100,10 +100,11 @@ public class LoadMerchantCommand extends Command {
merchantData.setName(merchant.name); merchantData.setName(merchant.name);
merchantData.setColorName(merchant.colorName); merchantData.setColorName(merchant.colorName);
merchantData.setValidTriggers(merchant.validTriggers); merchantData.setValidTriggers(merchant.validTriggers);
for(MerchantItemForSale item : merchant.merchantItemForSales) { if( merchant.merchantItemForSales != null )
MerchantItemForSaleData itemData = merchantData.createMerchantItemForSaleData(); for(MerchantItemForSale item : merchant.merchantItemForSales) {
MerchantItemForSaleData.copyMerchantItemForSale(itemData, item); MerchantItemForSaleData itemData = merchantData.createMerchantItemForSaleData();
} MerchantItemForSaleData.copyMerchantItemForSale(itemData, item);
}
merchantData.setWelcomeMessage(merchant.welcomeMessage); merchantData.setWelcomeMessage(merchant.welcomeMessage);
merchantData.setMerchantType(merchant.merchantType); merchantData.setMerchantType(merchant.merchantType);
merchantData.setRoomIds(merchant.roomIds); merchantData.setRoomIds(merchant.roomIds);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment