Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-10-22 04:19:52 +02:00
Code Issues Projects Releases Wiki Activity

Index check block objectives, fixes #2299

Browse Source
This commit is contained in:
PikaMug 2024-10-20 02:40:26 -04:00
parent 85442a4760
commit 3e6c4afea1
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1893,6 +1893,9 @@ 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 (breakIndex >= bukkitQuestProgress.blocksBroken.size()) {
return;
}
if (bukkitQuestProgress.blocksBroken.get(breakIndex) >= goal.getAmount()) { if (bukkitQuestProgress.blocksBroken.get(breakIndex) >= goal.getAmount()) {
return; return;
} }
@ -1968,6 +1971,9 @@ 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 (damageIndex >= bukkitQuestProgress.blocksDamaged.size()) {
return;
}
if (bukkitQuestProgress.blocksDamaged.get(damageIndex) >= goal.getAmount()) { if (bukkitQuestProgress.blocksDamaged.get(damageIndex) >= goal.getAmount()) {
return; return;
} }
@ -2043,6 +2049,9 @@ 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 (placeIndex >= bukkitQuestProgress.blocksPlaced.size()) {
return;
}
if (bukkitQuestProgress.blocksPlaced.get(placeIndex) >= goal.getAmount()) { if (bukkitQuestProgress.blocksPlaced.get(placeIndex) >= goal.getAmount()) {
return; return;
} }
@ -2118,6 +2127,9 @@ 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 (useIndex >= bukkitQuestProgress.blocksUsed.size()) {
return;
}
if (bukkitQuestProgress.blocksUsed.get(useIndex) >= goal.getAmount()) { if (bukkitQuestProgress.blocksUsed.get(useIndex) >= goal.getAmount()) {
return; return;
} }
@ -2193,6 +2205,9 @@ 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 (cutIndex >= bukkitQuestProgress.blocksCut.size()) {
return;
}
if (bukkitQuestProgress.blocksCut.get(cutIndex) >= goal.getAmount()) { if (bukkitQuestProgress.blocksCut.get(cutIndex) >= goal.getAmount()) {
return; return;
} }