pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 01:11:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move ClientTaskState::RemoveTaskByTaskID to repository methods

Browse Source
This commit is contained in:
Akkadius 2021-02-06 03:46:03 -06:00
parent 19e9c0bc22
commit fac75a3ae0
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
zone/tasks.cpp
View File

@ -3329,7 +3329,10 @@ void TaskManager::SendSingleActiveTaskToClient(
for (int activity_id = 0; activity_id < GetActivityCount(task_id); activity_id++) { for (int activity_id = 0; activity_id < GetActivityCount(task_id); activity_id++) {
if (task_info.activity[activity_id].activity_state != ActivityHidden) { if (task_info.activity[activity_id].activity_state != ActivityHidden) {
LogTasks("[SendSingleActiveTaskToClient] Long [{}] [{}] complete [{}]", task_id, activity_id, task_complete); LogTasks("[SendSingleActiveTaskToClient] Long [{}] [{}] complete [{}]",
task_id,
activity_id,
task_complete);
if (activity_id == GetActivityCount(task_id) - 1) { if (activity_id == GetActivityCount(task_id) - 1) {
SendTaskActivityLong( SendTaskActivityLong(
client, task_id, activity_id, task_info.slot, client, task_id, activity_id, task_info.slot,
@ -3647,31 +3650,16 @@ void ClientTaskState::RemoveTaskByTaskID(Client *client, uint32 task_id)
{ {
auto task_type = p_task_manager->GetTaskType(task_id); auto task_type = p_task_manager->GetTaskType(task_id);
int character_id = client->CharacterID(); int character_id = client->CharacterID();
Log(Logs::General, Logs::Tasks, "[UPDATE] RemoveTaskByTaskID: %d", task_id);
std::string query = fmt::format(
"DELETE FROM character_activities WHERE charid = {} AND taskid = {}",
character_id,
task_id
);
auto results = database.QueryDatabase(query);
if (!results.Success()) {
LogError("[TASKS] Error in CientTaskState::RemoveTaskByTaskID [{}]", results.ErrorMessage().c_str());
return;
}
LogTasks("[UPDATE] RemoveTaskByTaskID: {}", query.c_str());
query = fmt::format( CharacterActivitiesRepository::DeleteWhere(
"DELETE FROM character_tasks WHERE charid = {} AND taskid = {} AND type = {}", database,
character_id, fmt::format("charid = {} AND taskid = {}", character_id, task_id)
task_id,
(int) task_type
); );
results = database.QueryDatabase(query);
if (!results.Success()) {
LogError("[TASKS] Error in ClientTaskState::RemoveTaskByTaskID [{}]", results.ErrorMessage().c_str());
}
LogTasks("[UPDATE] RemoveTaskByTaskID: {}", query.c_str()); CharacterTasksRepository::DeleteWhere(
database,
fmt::format("charid = {} AND taskid = {} AND type = {}", character_id, task_id, (int) task_type)
);
switch (task_type) { switch (task_type) {
case TaskType::Task: { case TaskType::Task: {