Merge branch 'master' of ssh://git@github.com/FlyingPikachu/Quests.git

This commit is contained in:
HappyPikachu 2016-12-04 17:17:49 -05:00
commit e1276a9597

View File

@ -1391,7 +1391,8 @@ public class Quester {
int amount = getQuestData(quest).itemsDelivered.get(found);
int req = getCurrentStage(quest).itemsToDeliver.get(getCurrentStage(quest).itemsToDeliver.indexOf(found)).getAmount();
Material m = null;
Material m = i.getType();
if (amount < req) {
if ((i.getAmount() + amount) > req) {