Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2025-01-26 02:01:54 +01:00
Code Issues Projects Releases Wiki Activity

Throw exception for insufficient delivery target IDs, fixes #1293

Browse Source
This commit is contained in:
PikaMug 2020-05-07 23:32:50 -04:00
parent 351ec5acf6
commit 3095ed6799
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
main/src/main/java/me/blackvein/quests/Quests.java
View File

@ -2446,28 +2446,33 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
// Legacy
for (String item : items) {
ItemStack is = ItemUtil.readItemStack("" + item);
int npcId = itemDeliveryTargetIds.get(index);
index++;
if (is != null) {
if (getDependencies().getCitizens() != null) {
NPC npc = CitizensAPI.getNPCRegistry().getById(npcId);
if (npc != null) {
oStage.itemsToDeliver.add(is);
oStage.itemDeliveryTargets.add(npcId);
oStage.deliverMessages.addAll(deliveryMessages);
if (index <= itemDeliveryTargetIds.size()) {
int npcId = itemDeliveryTargetIds.get(index);
index++;
if (is != null) {
if (getDependencies().getCitizens() != null) {
NPC npc = CitizensAPI.getNPCRegistry().getById(npcId);
if (npc != null) {
oStage.itemsToDeliver.add(is);
oStage.itemDeliveryTargets.add(npcId);
oStage.deliverMessages.addAll(deliveryMessages);
} else {
throw new StageFormatException(
"npc-delivery-ids has invalid NPC ID of " + npcId, quest,
stageNum);
}
} else {
throw new StageFormatException(
"npc-delivery-ids has invalid NPC ID of " + npcId, quest,
"Citizens was not found installed for npc-delivery-ids", quest,
stageNum);
}
} else {
throw new StageFormatException(
"Citizens was not found installed for npc-delivery-ids", quest,
stageNum);
throw new StageFormatException("items-to-deliver has invalid formatting "
+ item, quest, stageNum);
}
} else {
throw new StageFormatException("items-to-deliver has invalid formatting "
+ item, quest, stageNum);
throw new StageFormatException("items-to-deliver is missing target IDs"
, quest, stageNum);
}
}
} else {