Upstream
/
Quests
mirror of https://github.com/PikaMug/Quests.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Quest with failed condition should not eclipse others, by @AlessioDP

This commit is contained in:
PikaMug 2021-01-13 23:56:21 -05:00
parent 715d093a15
commit 941e06b115
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/src/main/java/me/blackvein/quests/listeners/BlockListener.java
View File

@ -60,7 +60,7 @@ public class BlockListener implements Listener {
for (final Quest quest : plugin.getQuests()) {
if (evt.isCancelled() == false) {
if (!quester.meetsCondition(quest, true)) {
return;
continue;
}
if (quester.getCurrentQuests().containsKey(quest)
&& quester.getCurrentStage(quest).containsObjective(breakType)) {
@ -165,7 +165,7 @@ public class BlockListener implements Listener {
final ObjectiveType type = ObjectiveType.DAMAGE_BLOCK;
for (final Quest quest : plugin.getQuests()) {
if (!quester.meetsCondition(quest, true)) {
return;
continue;
}
if (quester.getCurrentQuests().containsKey(quest)
@ -193,7 +193,7 @@ public class BlockListener implements Listener {
for (final Quest quest : plugin.getQuests()) {
if (evt.isCancelled() == false) {
if (!quester.meetsCondition(quest, true)) {
return;
continue;
}
if (quester.getCurrentQuests().containsKey(quest)
@ -233,7 +233,7 @@ public class BlockListener implements Listener {
final ObjectiveType type = ObjectiveType.USE_BLOCK;
for (final Quest quest : plugin.getQuests()) {
if (!quester.meetsCondition(quest, true)) {
return;
continue;
}
if (quester.getCurrentQuests().containsKey(quest)

10
main/src/main/java/me/blackvein/quests/listeners/ItemListener.java
View File

@ -48,7 +48,7 @@ public class ItemListener implements Listener {
final ObjectiveType type = ObjectiveType.CRAFT_ITEM;
for (final Quest quest : plugin.getQuests()) {
if (!quester.meetsCondition(quest, true)) {
return;
continue;
}
if (quester.getCurrentQuests().containsKey(quest)
@ -93,7 +93,7 @@ public class ItemListener implements Listener {
final ObjectiveType type = ObjectiveType.SMELT_ITEM;
for (final Quest quest : plugin.getQuests()) {
if (!quester.meetsCondition(quest, true)) {
return;
continue;
}
if (quester.getCurrentQuests().containsKey(quest)
@ -113,7 +113,7 @@ public class ItemListener implements Listener {
final ObjectiveType type = ObjectiveType.BREW_ITEM;
for (final Quest quest : plugin.getQuests()) {
if (!quester.meetsCondition(quest, true)) {
return;
continue;
}
if (quester.getCurrentQuests().containsKey(quest)
@ -145,7 +145,7 @@ public class ItemListener implements Listener {
final ObjectiveType type = ObjectiveType.ENCHANT_ITEM;
for (final Quest quest : plugin.getQuests()) {
if (!quester.meetsCondition(quest, true)) {
return;
continue;
}
if (quester.getCurrentQuests().containsKey(quest)
@ -171,7 +171,7 @@ public class ItemListener implements Listener {
final ObjectiveType type = ObjectiveType.CONSUME_ITEM;
for (final Quest quest : plugin.getQuests()) {
if (!quester.meetsCondition(quest, true)) {
return;
continue;
}
if (quester.getCurrentQuests().containsKey(quest)

20
main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
View File

@ -396,7 +396,7 @@ public class PlayerListener implements Listener {
final ObjectiveType type = ObjectiveType.MILK_COW;
for (final Quest quest : plugin.getQuests()) {
if (!quester.meetsCondition(quest, true)) {
return;
continue;
}
if (quester.getCurrentQuests().containsKey(quest)
@ -419,7 +419,7 @@ public class PlayerListener implements Listener {
final Quester quester = plugin.getQuester(evt.getPlayer().getUniqueId());
for (final Quest quest : plugin.getQuests()) {
if (!quester.meetsCondition(quest, true)) {
return;
continue;
}
if (quester.getCurrentQuests().containsKey(quest)) {
@ -511,7 +511,7 @@ public class PlayerListener implements Listener {
final ObjectiveType type = ObjectiveType.SHEAR_SHEEP;
for (final Quest quest : plugin.getQuests()) {
if (!quester.meetsCondition(quest, true)) {
return;
continue;
}
if (quester.getCurrentQuests().containsKey(quest)
@ -537,7 +537,7 @@ public class PlayerListener implements Listener {
final ObjectiveType type = ObjectiveType.TAME_MOB;
for (final Quest quest : plugin.getQuests()) {
if (!quester.meetsCondition(quest, true)) {
return;
continue;
}
if (quester.getCurrentQuests().containsKey(quest)
@ -604,7 +604,7 @@ public class PlayerListener implements Listener {
final ObjectiveType type = ObjectiveType.KILL_NPC;
for (final Quest quest : plugin.getQuests()) {
if (!quester.meetsCondition(quest, true)) {
return;
continue;
}
if (quester.getCurrentQuests().containsKey(quest)
@ -621,7 +621,7 @@ public class PlayerListener implements Listener {
final ObjectiveType type = ObjectiveType.KILL_MOB;
for (final Quest quest : plugin.getQuests()) {
if (!quester.meetsCondition(quest, true)) {
return;
continue;
}
if (quester.getCurrentQuests().containsKey(quest)
@ -723,7 +723,7 @@ public class PlayerListener implements Listener {
final ObjectiveType type = ObjectiveType.KILL_PLAYER;
for (final Quest quest : plugin.getQuests()) {
if (!quester.meetsCondition(quest, true)) {
return;
continue;
}
if (quester.getCurrentQuests().containsKey(quest)
@ -747,7 +747,7 @@ public class PlayerListener implements Listener {
final ObjectiveType type = ObjectiveType.CATCH_FISH;
for (final Quest quest : plugin.getQuests()) {
if (!quester.meetsCondition(quest, true)) {
return;
continue;
}
if (quester.getCurrentQuests().containsKey(quest)
@ -772,7 +772,7 @@ public class PlayerListener implements Listener {
quester.findCompassTarget();
for (final Quest quest : plugin.getQuests()) {
if (!quester.meetsCondition(quest, true)) {
return;
continue;
}
}
}
@ -918,7 +918,7 @@ public class PlayerListener implements Listener {
final ObjectiveType type = ObjectiveType.REACH_LOCATION;
for (final Quest quest : plugin.getQuests()) {
if (!quester.meetsCondition(quest, false)) {
return;
continue;
}
if (quester.getCurrentQuests().containsKey(quest)) {