Merge branch 'master' into feat/postgresql-database

This commit is contained in:
P0nk
2024-02-04 15:12:14 +01:00
9 changed files with 53 additions and 11 deletions

View File

@@ -107,7 +107,7 @@ public class QuestScriptManager extends AbstractScriptManager {
public void end(Client c, short questid, int npc) {
Quest quest = Quest.getInstance(questid);
if (!c.getPlayer().getQuest(quest).getStatus().equals(QuestStatus.Status.STARTED) || !c.getPlayer().getMap().containsNPC(npc)) {
if (!c.getPlayer().getQuest(quest).getStatus().equals(QuestStatus.Status.STARTED) || (!c.getPlayer().getMap().containsNPC(npc) && !quest.isAutoComplete())) {
dispose(c);
return;
}