|
@@ -1737,6 +1737,11 @@ public class Quest extends ManagedScript
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
public boolean unload()
|
|
public boolean unload()
|
|
|
|
+ {
|
|
|
|
+ return unload(true);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public boolean unload(boolean removeFromList)
|
|
{
|
|
{
|
|
this.saveGlobalData();
|
|
this.saveGlobalData();
|
|
// cancel all pending timers before reloading.
|
|
// cancel all pending timers before reloading.
|
|
@@ -1747,7 +1752,10 @@ public class Quest extends ManagedScript
|
|
for (QuestTimer timer : timers)
|
|
for (QuestTimer timer : timers)
|
|
timer.cancel();
|
|
timer.cancel();
|
|
_allEventTimers.clear();
|
|
_allEventTimers.clear();
|
|
- return QuestManager.getInstance().removeQuest(this);
|
|
|
|
|
|
+ if (removeFromList)
|
|
|
|
+ return QuestManager.getInstance().removeQuest(this);
|
|
|
|
+ else
|
|
|
|
+ return true;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|