Fork/mmocore
2
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

Fixed an issue with quest bossbar

Browse Source
This commit is contained in:
Indyuce 2022-04-03 01:58:06 +02:00
parent d2022ca2e3
commit 227023cc37
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java
View File

@ -99,10 +99,10 @@ public class PlayerQuests implements Closable {
playerData.log(Level.WARNING, "Couldn't load current quest progress (ID '" + cur.get("id").getAsString() + "')"); playerData.log(Level.WARNING, "Couldn't load current quest progress (ID '" + cur.get("id").getAsString() + "')");
} }
} }
if (jo.has("finished")) {
if (jo.has("finished"))
for (Entry<String, JsonElement> entry : jo.getAsJsonObject("finished").entrySet()) for (Entry<String, JsonElement> entry : jo.getAsJsonObject("finished").entrySet())
finished.put(entry.getKey(), entry.getValue().getAsLong()); finished.put(entry.getKey(), entry.getValue().getAsLong());
}
for (Entry<String, Long> entry : finished.entrySet()) for (Entry<String, Long> entry : finished.entrySet())
MMOCore.log("Finished: (" + entry.getKey() + ") - at: " + entry.getValue()); MMOCore.log("Finished: (" + entry.getKey() + ") - at: " + entry.getValue());
@ -144,13 +144,21 @@ public class PlayerQuests implements Closable {
public void start(Quest quest) { public void start(Quest quest) {
// Close current objective progress if quest is active // Close current objective progress if quest is active
close(); closeCurrentQuest();
// Apply newest quest // Apply newest quest
current = quest == null ? null : quest.generateNewProgress(playerData); current = quest == null ? null : quest.generateNewProgress(playerData);
updateBossBar(); updateBossBar();
} }
public void closeCurrentQuest() {
if (current == null)
return;
current.getProgress().close();
current = null;
}
@Override @Override
public void close() { public void close() {
@ -158,8 +166,7 @@ public class PlayerQuests implements Closable {
bossbar.removeAll(); bossbar.removeAll();
// Close current objective progress // Close current objective progress
if (current != null) closeCurrentQuest();
current.getProgress().close();
} }
public boolean checkCooldownAvailability(Quest quest) { public boolean checkCooldownAvailability(Quest quest) {