Delivery messages must be same size as items to deliver, fixes #1409

This commit is contained in:
PikaMug 2020-09-18 17:46:10 -04:00
parent 23d38943f2
commit 27463d8be9

View File

@ -2489,6 +2489,11 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
for (final String item : items) {
final ItemStack is = ItemUtil.readItemStack("" + item);
if (index <= itemDeliveryTargetIds.size()) {
if (itemDeliveryTargetIds.size() != deliveryMessages.size()) {
throw new StageFormatException(
"delivery-messages must be same size as items-to-deliver",
quest, stageNum);
}
final int npcId = itemDeliveryTargetIds.get(index);
final String msg = deliveryMessages.size() > index
? deliveryMessages.get(index)
@ -2512,8 +2517,9 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
quest, stageNum);
}
} else {
throw new StageFormatException("items-to-deliver has invalid formatting "
+ item, quest, stageNum);
throw new StageFormatException(
"items-to-deliver has invalid formatting " + item, quest,
stageNum);
}
} else {
throw new StageFormatException("items-to-deliver is missing target IDs"