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

Ensure number of radii is sufficient for reach-location, see #1191

Browse Source
This commit is contained in:
PikaMug 2020-04-12 20:57:46 -04:00
parent fa02426dd5
commit 58d2030368
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/src/main/java/me/blackvein/quests/Quester.java
View File

@ -2057,6 +2057,9 @@ public class Quester {
if (getCurrentStage(quest).locationsToReach.size() <= index) { if (getCurrentStage(quest).locationsToReach.size() <= index) {
return; return;
} }
if (getCurrentStage(quest).radiiToReachWithin.size() <= index) {
return;
}
Location locationToReach = getCurrentStage(quest).locationsToReach.get(index); Location locationToReach = getCurrentStage(quest).locationsToReach.get(index);
double radius = getQuestData(quest).radiiToReachWithin.get(index); double radius = getQuestData(quest).radiiToReachWithin.get(index);
if (l.getX() < (locationToReach.getX() + radius) && l.getX() > (locationToReach.getX() - radius)) { if (l.getX() < (locationToReach.getX() + radius) && l.getX() > (locationToReach.getX() - radius)) {
@ -2064,7 +2067,7 @@ public class Quester {
if (l.getY() < (locationToReach.getY() + radius) && l.getY() if (l.getY() < (locationToReach.getY() + radius) && l.getY()
> (locationToReach.getY() - radius)) { > (locationToReach.getY() - radius)) {
if (l.getWorld().getName().equals(locationToReach.getWorld().getName())) { if (l.getWorld().getName().equals(locationToReach.getWorld().getName())) {
// TODO - Find proper cause of Github issues #646 and #825 // TODO - Find proper cause of Github issues #646 and #825 and #1191
if (index >= getQuestData(quest).hasReached.size()) { if (index >= getQuestData(quest).hasReached.size()) {
getQuestData(quest).hasReached.add(true); getQuestData(quest).hasReached.add(true);
finishObjective(quest, "reachLocation", new ItemStack(Material.AIR, 1), finishObjective(quest, "reachLocation", new ItemStack(Material.AIR, 1),