Check for null delivery items/npcs, should fix #93 and #134

This commit is contained in:
HappyPikachu 2015-06-06 16:09:37 -04:00
parent e2bab24d34
commit 9addf7c5ac

View File

@ -667,18 +667,16 @@ public class Quester {
for (ItemStack is : getCurrentStage(quest).itemsToDeliver) {
int delivered = 999;
int amt = 999;
int delivered = 0;
int amt = is.getAmount();
Integer npc = null;
try {
delivered = getQuestData(quest).itemsDelivered.get(is);
amt = is.getAmount();
npc = getCurrentStage(quest).itemDeliveryTargets.get(getCurrentStage(quest).itemsToDeliver.indexOf(is));
} catch (Exception e) {
plugin.getLogger().severe("Issue grabbing data. Please report these values in Github ticket #93:");
plugin.getLogger().severe("quest = " + quest.name + ", delivered = " + delivered + ", amt = " + amt + ", npc = " + npc);
e.printStackTrace();
}
if (getQuestData(quest).itemsDelivered.get(is) != null) {
delivered = getQuestData(quest).itemsDelivered.get(is);
}
if (getCurrentStage(quest).itemDeliveryTargets.get(getCurrentStage(quest).itemsToDeliver.indexOf(is)) != null) {
npc = getCurrentStage(quest).itemDeliveryTargets.get(getCurrentStage(quest).itemsToDeliver.indexOf(is));
}
if (delivered < amt) {