Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-11-22 02:25:42 +01:00
Code Issues Projects Releases Wiki Activity

Do not exceed goal amount, fixes #2274

Browse Source
This commit is contained in:
PikaMug 2024-08-08 05:08:16 -04:00
parent 2fb6b68949
commit 3a94526373
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/main/java/me/pikamug/quests/player/BukkitQuester.java
View File

@ -1893,12 +1893,12 @@ public class BukkitQuester implements Quester {
final BukkitQuestProgress bukkitQuestProgress = (BukkitQuestProgress) getQuestProgressOrDefault(quest); final BukkitQuestProgress bukkitQuestProgress = (BukkitQuestProgress) getQuestProgressOrDefault(quest);
final int breakIndex = getCurrentStage(quest).getBlocksToBreak().indexOf(goal); final int breakIndex = getCurrentStage(quest).getBlocksToBreak().indexOf(goal);
if (bukkitQuestProgress.blocksBroken.get(breakIndex) > goal.getAmount()) { if (bukkitQuestProgress.blocksBroken.get(breakIndex) >= goal.getAmount()) {
return; return;
} }
final int progress = bukkitQuestProgress.blocksBroken.get(breakIndex) + 1; final int progress = bukkitQuestProgress.blocksBroken.get(breakIndex) + 1;
bukkitQuestProgress.blocksBroken.set(breakIndex, progress); bukkitQuestProgress.blocksBroken.set(breakIndex, progress);
if (progress >= goal.getAmount()) { if (progress == goal.getAmount()) {
finishObjective(quest, new BukkitObjective(type, null, progress, goal), null, null, null, finishObjective(quest, new BukkitObjective(type, null, progress, goal), null, null, null,
null, null, null, null); null, null, null, null);
@ -1968,12 +1968,12 @@ public class BukkitQuester implements Quester {
final BukkitQuestProgress bukkitQuestProgress = (BukkitQuestProgress) getQuestProgressOrDefault(quest); final BukkitQuestProgress bukkitQuestProgress = (BukkitQuestProgress) getQuestProgressOrDefault(quest);
final int damageIndex = getCurrentStage(quest).getBlocksToDamage().indexOf(goal); final int damageIndex = getCurrentStage(quest).getBlocksToDamage().indexOf(goal);
if (bukkitQuestProgress.blocksDamaged.get(damageIndex) > goal.getAmount()) { if (bukkitQuestProgress.blocksDamaged.get(damageIndex) >= goal.getAmount()) {
return; return;
} }
final int progress = bukkitQuestProgress.blocksDamaged.get(damageIndex) + 1; final int progress = bukkitQuestProgress.blocksDamaged.get(damageIndex) + 1;
bukkitQuestProgress.blocksDamaged.set(damageIndex, progress); bukkitQuestProgress.blocksDamaged.set(damageIndex, progress);
if (progress >= goal.getAmount()) { if (progress == goal.getAmount()) {
finishObjective(quest, new BukkitObjective(type, null, progress, goal), null, null, null, finishObjective(quest, new BukkitObjective(type, null, progress, goal), null, null, null,
null, null, null, null); null, null, null, null);
@ -2043,12 +2043,12 @@ public class BukkitQuester implements Quester {
final BukkitQuestProgress bukkitQuestProgress = (BukkitQuestProgress) getQuestProgressOrDefault(quest); final BukkitQuestProgress bukkitQuestProgress = (BukkitQuestProgress) getQuestProgressOrDefault(quest);
final int placeIndex = getCurrentStage(quest).getBlocksToPlace().indexOf(goal); final int placeIndex = getCurrentStage(quest).getBlocksToPlace().indexOf(goal);
if (bukkitQuestProgress.blocksPlaced.get(placeIndex) > goal.getAmount()) { if (bukkitQuestProgress.blocksPlaced.get(placeIndex) >= goal.getAmount()) {
return; return;
} }
final int progress = bukkitQuestProgress.blocksPlaced.get(placeIndex) + 1; final int progress = bukkitQuestProgress.blocksPlaced.get(placeIndex) + 1;
bukkitQuestProgress.blocksPlaced.set(placeIndex, progress); bukkitQuestProgress.blocksPlaced.set(placeIndex, progress);
if (progress >= goal.getAmount()) { if (progress == goal.getAmount()) {
finishObjective(quest, new BukkitObjective(type, null, progress, goal), null, null, null, finishObjective(quest, new BukkitObjective(type, null, progress, goal), null, null, null,
null, null, null, null); null, null, null, null);
@ -2118,12 +2118,12 @@ public class BukkitQuester implements Quester {
final BukkitQuestProgress bukkitQuestProgress = (BukkitQuestProgress) getQuestProgressOrDefault(quest); final BukkitQuestProgress bukkitQuestProgress = (BukkitQuestProgress) getQuestProgressOrDefault(quest);
final int useIndex = getCurrentStage(quest).getBlocksToUse().indexOf(goal); final int useIndex = getCurrentStage(quest).getBlocksToUse().indexOf(goal);
if (bukkitQuestProgress.blocksUsed.get(useIndex) > goal.getAmount()) { if (bukkitQuestProgress.blocksUsed.get(useIndex) >= goal.getAmount()) {
return; return;
} }
final int progress = bukkitQuestProgress.blocksUsed.get(useIndex) + 1; final int progress = bukkitQuestProgress.blocksUsed.get(useIndex) + 1;
bukkitQuestProgress.blocksUsed.set(useIndex, progress); bukkitQuestProgress.blocksUsed.set(useIndex, progress);
if (progress >= goal.getAmount()) { if (progress == goal.getAmount()) {
finishObjective(quest, new BukkitObjective(type, null, progress, goal), null, null, null, finishObjective(quest, new BukkitObjective(type, null, progress, goal), null, null, null,
null, null, null, null); null, null, null, null);
@ -2193,12 +2193,12 @@ public class BukkitQuester implements Quester {
final BukkitQuestProgress bukkitQuestProgress = (BukkitQuestProgress) getQuestProgressOrDefault(quest); final BukkitQuestProgress bukkitQuestProgress = (BukkitQuestProgress) getQuestProgressOrDefault(quest);
final int cutIndex = getCurrentStage(quest).getBlocksToCut().indexOf(goal); final int cutIndex = getCurrentStage(quest).getBlocksToCut().indexOf(goal);
if (bukkitQuestProgress.blocksCut.get(cutIndex) > goal.getAmount()) { if (bukkitQuestProgress.blocksCut.get(cutIndex) >= goal.getAmount()) {
return; return;
} }
final int progress = bukkitQuestProgress.blocksCut.get(cutIndex) + 1; final int progress = bukkitQuestProgress.blocksCut.get(cutIndex) + 1;
bukkitQuestProgress.blocksCut.set(cutIndex, progress); bukkitQuestProgress.blocksCut.set(cutIndex, progress);
if (progress >= goal.getAmount()) { if (progress == goal.getAmount()) {
finishObjective(quest, new BukkitObjective(type, null, progress, goal), null, null, null, finishObjective(quest, new BukkitObjective(type, null, progress, goal), null, null, null,
null, null, null, null); null, null, null, null);