pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 17:26:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Final

Browse Source
This commit is contained in:
Kinglykrab
2025-06-22 13:42:06 -04:00
parent 6a05dafe65
commit 61d144533a
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/questmgr.cpp
+11 -11
View File
@@ -2868,27 +2868,27 @@ bool QuestManager::createBot(const char *name, const char *lastname, uint8 level
void QuestManager::taskselector(const std::vector<int>& tasks, bool ignore_cooldown) { void QuestManager::taskselector(const std::vector<int>& tasks, bool ignore_cooldown) {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
if(RuleB(TaskSystem, EnableTaskSystem) && initiator && owner && TaskManager::Instance()) if(RuleB(TaskSystem, EnableTaskSystem) && initiator && owner)
initiator->TaskQuestSetSelector(owner, tasks, ignore_cooldown); initiator->TaskQuestSetSelector(owner, tasks, ignore_cooldown);
} }
void QuestManager::enabletask(int taskcount, int *tasks) { void QuestManager::enabletask(int taskcount, int *tasks) {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
if(RuleB(TaskSystem, EnableTaskSystem) && initiator && TaskManager::Instance()) if(RuleB(TaskSystem, EnableTaskSystem) && initiator)
initiator->EnableTask(taskcount, tasks); initiator->EnableTask(taskcount, tasks);
} }
void QuestManager::disabletask(int taskcount, int *tasks) { void QuestManager::disabletask(int taskcount, int *tasks) {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
if(RuleB(TaskSystem, EnableTaskSystem) && initiator && TaskManager::Instance()) if(RuleB(TaskSystem, EnableTaskSystem) && initiator)
initiator->DisableTask(taskcount, tasks); initiator->DisableTask(taskcount, tasks);
} }
bool QuestManager::istaskenabled(int taskid) { bool QuestManager::istaskenabled(int taskid) {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
if(RuleB(TaskSystem, EnableTaskSystem) && initiator && TaskManager::Instance()) if(RuleB(TaskSystem, EnableTaskSystem) && initiator)
return initiator->IsTaskEnabled(taskid); return initiator->IsTaskEnabled(taskid);
return false; return false;
@@ -2897,7 +2897,7 @@ bool QuestManager::istaskenabled(int taskid) {
void QuestManager::tasksetselector(int tasksetid, bool ignore_cooldown) { void QuestManager::tasksetselector(int tasksetid, bool ignore_cooldown) {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
Log(Logs::General, Logs::Tasks, "[UPDATE] TaskSetSelector called for task set %i", tasksetid); Log(Logs::General, Logs::Tasks, "[UPDATE] TaskSetSelector called for task set %i", tasksetid);
if(RuleB(TaskSystem, EnableTaskSystem) && initiator && owner && TaskManager::Instance()) if(RuleB(TaskSystem, EnableTaskSystem) && initiator && owner)
initiator->TaskSetSelector(owner, tasksetid, ignore_cooldown); initiator->TaskSetSelector(owner, tasksetid, ignore_cooldown);
} }
@@ -2979,7 +2979,7 @@ int QuestManager::enabledtaskcount(int taskset) {
int QuestManager::firsttaskinset(int taskset) { int QuestManager::firsttaskinset(int taskset) {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
if(RuleB(TaskSystem, EnableTaskSystem) && TaskManager::Instance()) if(RuleB(TaskSystem, EnableTaskSystem))
return TaskManager::Instance()->FirstTaskInSet(taskset); return TaskManager::Instance()->FirstTaskInSet(taskset);
return -1; return -1;
@@ -2988,7 +2988,7 @@ int QuestManager::firsttaskinset(int taskset) {
int QuestManager::lasttaskinset(int taskset) { int QuestManager::lasttaskinset(int taskset) {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
if(RuleB(TaskSystem, EnableTaskSystem) && TaskManager::Instance()) if(RuleB(TaskSystem, EnableTaskSystem))
return TaskManager::Instance()->LastTaskInSet(taskset); return TaskManager::Instance()->LastTaskInSet(taskset);
return -1; return -1;
@@ -2997,7 +2997,7 @@ int QuestManager::lasttaskinset(int taskset) {
int QuestManager::nexttaskinset(int taskset, int taskid) { int QuestManager::nexttaskinset(int taskset, int taskid) {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
if(RuleB(TaskSystem, EnableTaskSystem) && TaskManager::Instance()) if(RuleB(TaskSystem, EnableTaskSystem))
return TaskManager::Instance()->NextTaskInSet(taskset, taskid); return TaskManager::Instance()->NextTaskInSet(taskset, taskid);
return -1; return -1;
@@ -3063,7 +3063,7 @@ int QuestManager::completedtasksinset(int taskset) {
bool QuestManager::istaskappropriate(int task) { bool QuestManager::istaskappropriate(int task) {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
if(RuleB(TaskSystem, EnableTaskSystem) && initiator && TaskManager::Instance()) if(RuleB(TaskSystem, EnableTaskSystem) && initiator)
return TaskManager::Instance()->ValidateLevel(task, initiator->GetLevel()); return TaskManager::Instance()->ValidateLevel(task, initiator->GetLevel());
return false; return false;
@@ -3082,7 +3082,7 @@ std::string QuestManager::gettaskname(uint32 task_id) {
int QuestManager::GetCurrentDzTaskID() { int QuestManager::GetCurrentDzTaskID() {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
if (RuleB(TaskSystem, EnableTaskSystem) && zone && TaskManager::Instance()) { if (RuleB(TaskSystem, EnableTaskSystem) && zone) {
return TaskManager::Instance()->GetCurrentDzTaskID(); return TaskManager::Instance()->GetCurrentDzTaskID();
} }
@@ -3092,7 +3092,7 @@ int QuestManager::GetCurrentDzTaskID() {
void QuestManager::EndCurrentDzTask(bool send_fail) { void QuestManager::EndCurrentDzTask(bool send_fail) {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
if (RuleB(TaskSystem, EnableTaskSystem) && zone && TaskManager::Instance()) { if (RuleB(TaskSystem, EnableTaskSystem) && zone) {
TaskManager::Instance()->EndCurrentDzTask(send_fail); TaskManager::Instance()->EndCurrentDzTask(send_fail);
} }
} }
zone/tasks.cpp
+1 -1
View File
@@ -14,7 +14,7 @@ extern QueryServ *QServ;
void Client::LoadClientTaskState() void Client::LoadClientTaskState()
{ {
if (RuleB(TaskSystem, EnableTaskSystem) && TaskManager::Instance()) { if (RuleB(TaskSystem, EnableTaskSystem)) {
LoadClientSharedCompletedTasks(); LoadClientSharedCompletedTasks();
safe_delete(task_state); safe_delete(task_state);