Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-09-30 07:57:32 +02:00
Code Issues Projects Releases Wiki Activity

Return null if Quester lookup uses null UUID, fixes #1418

Browse Source
This commit is contained in:
PikaMug 2020-10-09 00:26:55 -04:00
parent 28030649c2
commit 5ae6d357e8
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
main/src/main/java/me/blackvein/quests/Quests.java
View File

@ -1305,28 +1305,28 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
* Get Quester from player UUID
*
* @param id Player UUID
* @return Quester, or null if not found
* @return Quester, or null if UUID is null
*/
public Quester getQuester(final UUID id) {
Quester quester = null;
if (id == null) {
return null;
}
for (final Quester q: questers) {
if (q != null && q.getUUID().equals(id)) {
quester = q;
return q;
}
}
if (quester == null) {
quester = new Quester(this);
quester.setUUID(id);
if (depends.getCitizens() != null) {
if (depends.getCitizens().getNPCRegistry().getByUniqueId(id) != null) {
return quester;
}
}
questers.add(quester);
if (!quester.loadData()) {
questers.remove(quester);
final Quester quester = new Quester(this);
quester.setUUID(id);
if (depends.getCitizens() != null) {
if (depends.getCitizens().getNPCRegistry().getByUniqueId(id) != null) {
return quester;
}
}
questers.add(quester);
if (!quester.loadData()) {
questers.remove(quester);
}
return quester;
}