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

[Logs] Fix output for tasks in logs (#4907)

Browse Source
This commit is contained in:
JJ 2025-06-09 13:32:45 -04:00 committed by GitHub
parent 567d46c3d6
commit 687d10960a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/shared_tasks.h
View File

@ -48,7 +48,7 @@ enum class SharedTaskRequestGroupType {
struct ServerSharedTaskRequest_Struct { struct ServerSharedTaskRequest_Struct {
uint32 requested_character_id; uint32 requested_character_id;
uint32 requested_task_id; uint32 requested_task_id;
uint32 requested_npc_type_id; // original task logic passthrough uint32 requested_npc_entity_id; // original task logic passthrough
uint32 accept_time; uint32 accept_time;
}; };

8
world/shared_task_manager.cpp
View File

@ -677,10 +677,10 @@ void SharedTaskManager::SendAcceptNewSharedTaskPacket(
); );
auto d = reinterpret_cast<ServerSharedTaskRequest_Struct *>(p->pBuffer); auto d = reinterpret_cast<ServerSharedTaskRequest_Struct *>(p->pBuffer);
d->requested_character_id = character_id; d->requested_character_id = character_id;
d->requested_task_id = task_id; d->requested_task_id = task_id;
d->requested_npc_type_id = npc_context_id; d->requested_npc_entity_id = npc_context_id;
d->accept_time = accept_time; d->accept_time = accept_time;
// get requested character zone server // get requested character zone server
ClientListEntry *cle = client_list.FindCLEByCharacterID(character_id); ClientListEntry *cle = client_list.FindCLEByCharacterID(character_id);

6
world/shared_task_world_messaging.cpp
View File

@ -24,16 +24,16 @@ void SharedTaskWorldMessaging::HandleZoneMessage(ServerPacket *pack)
case ServerOP_SharedTaskRequest: { case ServerOP_SharedTaskRequest: {
auto *r = (ServerSharedTaskRequest_Struct *) pack->pBuffer; auto *r = (ServerSharedTaskRequest_Struct *) pack->pBuffer;
LogTasksDetail( LogTasksDetail(
"[ServerOP_SharedTaskRequest] Received request from character [{}] task_id [{}] npc_type_id [{}]", "[ServerOP_SharedTaskRequest] Received request from character [{}] task_id [{}] npc_entity_id [{}]",
r->requested_character_id, r->requested_character_id,
r->requested_task_id, r->requested_task_id,
r->requested_npc_type_id r->requested_npc_entity_id
); );
shared_task_manager.AttemptSharedTaskCreation( shared_task_manager.AttemptSharedTaskCreation(
r->requested_task_id, r->requested_task_id,
r->requested_character_id, r->requested_character_id,
r->requested_npc_type_id r->requested_npc_entity_id
); );
break; break;

2
zone/shared_task_zone_messaging.cpp
View File

@ -20,7 +20,7 @@ void SharedTaskZoneMessaging::HandleWorldMessage(ServerPacket *pack)
->AcceptNewTask( ->AcceptNewTask(
c, c,
(int) p->requested_task_id, (int) p->requested_task_id,
(int) p->requested_npc_type_id, (int) p->requested_npc_entity_id,
p->accept_time p->accept_time
); );
c->LoadClientTaskState(); c->LoadClientTaskState();

8
zone/task_client_state.cpp
View File

@ -1968,7 +1968,7 @@ void ClientTaskState::RemoveTaskByTaskID(Client *client, uint32 task_id)
void ClientTaskState::AcceptNewTask( void ClientTaskState::AcceptNewTask(
Client *client, Client *client,
int task_id, int task_id,
int npc_type_id, int npc_entity_id,
time_t accept_time, time_t accept_time,
bool enforce_level_requirement bool enforce_level_requirement
) )
@ -2001,7 +2001,7 @@ void ClientTaskState::AcceptNewTask(
// fill // fill
r->requested_character_id = client->CharacterID(); r->requested_character_id = client->CharacterID();
r->requested_task_id = task_id; r->requested_task_id = task_id;
r->requested_npc_type_id = npc_type_id; r->requested_npc_entity_id = npc_entity_id;
// send // send
worldserver.SendPacket(pack); worldserver.SendPacket(pack);
@ -2190,11 +2190,11 @@ void ClientTaskState::AcceptNewTask(
task_manager->SaveClientState(client, this); task_manager->SaveClientState(client, this);
NPC *npc = entity_list.GetID(npc_type_id)->CastToNPC(); NPC *npc = entity_list.GetNPCByID(npc_entity_id);
if (npc) { if (npc) {
if (player_event_logs.IsEventEnabled(PlayerEvent::TASK_ACCEPT)) { if (player_event_logs.IsEventEnabled(PlayerEvent::TASK_ACCEPT)) {
auto e = PlayerEvent::TaskAcceptEvent{ auto e = PlayerEvent::TaskAcceptEvent{
.npc_id = static_cast<uint32>(npc_type_id), .npc_id = npc->GetNPCTypeID(),
.npc_name = npc->GetCleanName(), .npc_name = npc->GetCleanName(),
.task_id = static_cast<uint32>(task_id), .task_id = static_cast<uint32>(task_id),
.task_name = task_manager->GetTaskName(static_cast<uint32>(task_id)), .task_name = task_manager->GetTaskName(static_cast<uint32>(task_id)),

2
zone/task_client_state.h
View File

@ -42,7 +42,7 @@ public:
int GetTaskActivityDoneCount(TaskType task_type, int index, int activity_id); int GetTaskActivityDoneCount(TaskType task_type, int index, int activity_id);
int GetTaskActivityDoneCountFromTaskID(int task_id, int activity_id); int GetTaskActivityDoneCountFromTaskID(int task_id, int activity_id);
int GetTaskStartTime(TaskType task_type, int index); int GetTaskStartTime(TaskType task_type, int index);
void AcceptNewTask(Client *client, int task_id, int npc_type_id, time_t accept_time, bool enforce_level_requirement = false); void AcceptNewTask(Client *client, int task_id, int npc_entity_id, time_t accept_time, bool enforce_level_requirement = false);
void FailTask(Client *client, int task_id); void FailTask(Client *client, int task_id);
int TaskTimeLeft(int task_id); int TaskTimeLeft(int task_id);
bool IsTaskCompleted(int task_id, Client *c = nullptr); bool IsTaskCompleted(int task_id, Client *c = nullptr);