From 61d144533a5af64de543f304260273de424121f2 Mon Sep 17 00:00:00 2001
From: Kinglykrab <kinglykrab@gmail.com>
Date: Sun, 22 Jun 2025 13:42:06 -0400
Subject: [PATCH] Final

---
 zone/questmgr.cpp | 22 +++++++++++-----------
 zone/tasks.cpp    |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp
index fce1d672e..b57ba8403 100644
--- a/zone/questmgr.cpp
+++ b/zone/questmgr.cpp
@@ -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) {
 	QuestManagerCurrentQuestVars();
-	if(RuleB(TaskSystem, EnableTaskSystem) && initiator && owner && TaskManager::Instance())
+	if(RuleB(TaskSystem, EnableTaskSystem) && initiator && owner)
 		initiator->TaskQuestSetSelector(owner, tasks, ignore_cooldown);
 }
 void QuestManager::enabletask(int taskcount, int *tasks) {
 	QuestManagerCurrentQuestVars();
 
-	if(RuleB(TaskSystem, EnableTaskSystem) && initiator && TaskManager::Instance())
+	if(RuleB(TaskSystem, EnableTaskSystem) && initiator)
 		initiator->EnableTask(taskcount, tasks);
 }
 
 void QuestManager::disabletask(int taskcount, int *tasks) {
 	QuestManagerCurrentQuestVars();
 
-	if(RuleB(TaskSystem, EnableTaskSystem) && initiator && TaskManager::Instance())
+	if(RuleB(TaskSystem, EnableTaskSystem) && initiator)
 		initiator->DisableTask(taskcount, tasks);
 }
 
 bool QuestManager::istaskenabled(int taskid) {
 	QuestManagerCurrentQuestVars();
 
-	if(RuleB(TaskSystem, EnableTaskSystem) && initiator && TaskManager::Instance())
+	if(RuleB(TaskSystem, EnableTaskSystem) && initiator)
 		return initiator->IsTaskEnabled(taskid);
 
 	return false;
@@ -2897,7 +2897,7 @@ bool QuestManager::istaskenabled(int taskid) {
 void QuestManager::tasksetselector(int tasksetid, bool ignore_cooldown) {
 	QuestManagerCurrentQuestVars();
 	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);
 }
 
@@ -2979,7 +2979,7 @@ int QuestManager::enabledtaskcount(int taskset) {
 int QuestManager::firsttaskinset(int taskset) {
 	QuestManagerCurrentQuestVars();
 
-	if(RuleB(TaskSystem, EnableTaskSystem) && TaskManager::Instance())
+	if(RuleB(TaskSystem, EnableTaskSystem))
 		return TaskManager::Instance()->FirstTaskInSet(taskset);
 
 	return -1;
@@ -2988,7 +2988,7 @@ int QuestManager::firsttaskinset(int taskset) {
 int QuestManager::lasttaskinset(int taskset) {
 	QuestManagerCurrentQuestVars();
 
-	if(RuleB(TaskSystem, EnableTaskSystem) && TaskManager::Instance())
+	if(RuleB(TaskSystem, EnableTaskSystem))
 		return TaskManager::Instance()->LastTaskInSet(taskset);
 
 	return -1;
@@ -2997,7 +2997,7 @@ int QuestManager::lasttaskinset(int taskset) {
 int QuestManager::nexttaskinset(int taskset, int taskid) {
 	QuestManagerCurrentQuestVars();
 
-	if(RuleB(TaskSystem, EnableTaskSystem) && TaskManager::Instance())
+	if(RuleB(TaskSystem, EnableTaskSystem))
 		return TaskManager::Instance()->NextTaskInSet(taskset, taskid);
 
 	return -1;
@@ -3063,7 +3063,7 @@ int QuestManager::completedtasksinset(int taskset) {
 bool QuestManager::istaskappropriate(int task) {
 	QuestManagerCurrentQuestVars();
 
-	if(RuleB(TaskSystem, EnableTaskSystem) && initiator && TaskManager::Instance())
+	if(RuleB(TaskSystem, EnableTaskSystem) && initiator)
 		return TaskManager::Instance()->ValidateLevel(task, initiator->GetLevel());
 
 	return false;
@@ -3082,7 +3082,7 @@ std::string QuestManager::gettaskname(uint32 task_id) {
 int QuestManager::GetCurrentDzTaskID() {
 	QuestManagerCurrentQuestVars();
 
-	if (RuleB(TaskSystem, EnableTaskSystem) && zone && TaskManager::Instance()) {
+	if (RuleB(TaskSystem, EnableTaskSystem) && zone) {
 		return TaskManager::Instance()->GetCurrentDzTaskID();
 	}
 
@@ -3092,7 +3092,7 @@ int QuestManager::GetCurrentDzTaskID() {
 void QuestManager::EndCurrentDzTask(bool send_fail) {
 	QuestManagerCurrentQuestVars();
 
-	if (RuleB(TaskSystem, EnableTaskSystem) && zone && TaskManager::Instance()) {
+	if (RuleB(TaskSystem, EnableTaskSystem) && zone) {
 		TaskManager::Instance()->EndCurrentDzTask(send_fail);
 	}
 }
diff --git a/zone/tasks.cpp b/zone/tasks.cpp
index b1b622316..708a43e84 100644
--- a/zone/tasks.cpp
+++ b/zone/tasks.cpp
@@ -14,7 +14,7 @@ extern QueryServ *QServ;
 
 void Client::LoadClientTaskState()
 {
-	if (RuleB(TaskSystem, EnableTaskSystem) && TaskManager::Instance()) {
+	if (RuleB(TaskSystem, EnableTaskSystem)) {
 		LoadClientSharedCompletedTasks();
 
 		safe_delete(task_state);