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

Avoid exception if there are no party members

Browse Source
This commit is contained in:
PikaMug 2019-09-15 21:41:54 -04:00
parent 515a1aa216
commit ba6cf5f620
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3280,6 +3280,9 @@ public class Quester {
public void dispatchMultiplayerEverything(Quest quest, String objectiveType, Function<Quester, Void> fun) { public void dispatchMultiplayerEverything(Quest quest, String objectiveType, Function<Quester, Void> fun) {
if (quest.getOptions().getShareProgressLevel() == 1) { if (quest.getOptions().getShareProgressLevel() == 1) {
List<Quester> mq = getMultiplayerQuesters(quest); List<Quester> mq = getMultiplayerQuesters(quest);
if (mq == null) {
return;
}
for (Quester q : mq) { for (Quester q : mq) {
if (q.containsObjective(quest, objectiveType)) { if (q.containsObjective(quest, objectiveType)) {
if (!quest.getOptions().getRequireSameQuest() || this.containsObjective(quest, objectiveType)) { if (!quest.getOptions().getRequireSameQuest() || this.containsObjective(quest, objectiveType)) {
@ -3379,17 +3382,17 @@ public class Quester {
* Get a list of follow Questers in a party or group * Get a list of follow Questers in a party or group
* *
* @param quest The quest which uses a linked plugin, i.e. Parties or DungeonsXL * @param quest The quest which uses a linked plugin, i.e. Parties or DungeonsXL
* @return null if quest is null, no linked plugins, or party/group is null * @return Potentially empty list of Questers or null for invalid quest
*/ */
public List<Quester> getMultiplayerQuesters(Quest quest) { public List<Quester> getMultiplayerQuesters(Quest quest) {
if (quest == null) { if (quest == null) {
return null; return null;
} }
List<Quester> mq = new LinkedList<Quester>();
if (plugin.getDependencies().getPartiesApi() != null) { if (plugin.getDependencies().getPartiesApi() != null) {
if (quest.getOptions().getUsePartiesPlugin()) { if (quest.getOptions().getUsePartiesPlugin()) {
Party party = plugin.getDependencies().getPartiesApi().getParty(plugin.getDependencies().getPartiesApi().getPartyPlayer(getUUID()).getPartyName()); Party party = plugin.getDependencies().getPartiesApi().getParty(plugin.getDependencies().getPartiesApi().getPartyPlayer(getUUID()).getPartyName());
if (party != null) { if (party != null) {
List<Quester> mq = new LinkedList<Quester>();
for (UUID id : party.getMembers()) { for (UUID id : party.getMembers()) {
if (!id.equals(getUUID())) { if (!id.equals(getUUID())) {
mq.add(plugin.getQuester(id)); mq.add(plugin.getQuester(id));
@ -3403,7 +3406,6 @@ public class Quester {
if (quest.getOptions().getUseDungeonsXLPlugin()) { if (quest.getOptions().getUseDungeonsXLPlugin()) {
DGroup group = DGroup.getByPlayer(getPlayer()); DGroup group = DGroup.getByPlayer(getPlayer());
if (group != null) { if (group != null) {
List<Quester> mq = new LinkedList<Quester>();
for (UUID id : group.getPlayers()) { for (UUID id : group.getPlayers()) {
if (!id.equals(getUUID())) { if (!id.equals(getUUID())) {
mq.add(plugin.getQuester(id)); mq.add(plugin.getQuester(id));
@ -3413,7 +3415,7 @@ public class Quester {
} }
} }
} }
return null; return mq;
} }
/** /**