Fixed being able to increase step1 over the max

This commit is contained in:
Teriuihi 2022-06-03 05:10:06 +02:00
parent 6d513de154
commit 263b0ddbd1
4 changed files with 5 additions and 5 deletions

View File

@ -126,7 +126,7 @@ public class BreedMobsQuest extends Quest {
}
public void breed(LivingEntity entity) {
if (isDone() || !entity.getType().equals(breedMobsQuestObject.getEntityType()))
if (isDone() || !entity.getType().equals(breedMobsQuestObject.getEntityType()) || getAmount() == getStep1())
return;
addStep1(1);
checkDone();

View File

@ -150,7 +150,7 @@ public class CollectDropsQuest extends Quest {
}
public void collectDrops(List<ItemStack> drops) {
if (isDone())
if (isDone() || getAmount() == getStep1())
return;
int total = drops.stream()
.filter(itemStack -> itemStack.getType().equals(collectDropsQuestObject.getMaterial()))
@ -158,7 +158,7 @@ public class CollectDropsQuest extends Quest {
.sum();
if (total == 0)
return;
addStep1(total);
addStep1(Math.min(total, getAmount() - getStep1()));
checkDone();
}
}

View File

@ -126,7 +126,7 @@ public class KillMobsQuest extends Quest {
}
public void kill(LivingEntity entity) {
if (isDone() || !entity.getType().equals(killMobsQuestObject.getEntityType()) || !entity.hasAI())
if (isDone() || !entity.getType().equals(killMobsQuestObject.getEntityType()) || !entity.hasAI() || getAmount() == getStep1())
return;
addStep1(1);
checkDone();

View File

@ -147,7 +147,7 @@ public class MineQuest extends Quest {
}
public void mine(Block block) {
if (isDone() || !block.getType().equals(mineQuestObject.getMaterial()))
if (isDone() || !block.getType().equals(mineQuestObject.getMaterial()) || getAmount() == getStep1())
return;
addStep1(1);
checkDone();