pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-04 18:46:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Shared Tasks] Task Kill Update Fix (#1573)

Browse Source 
* Revert "Revert "Shared task kill update fix""

This reverts commit 859751f74d.

* Swap return for continue in this context

* Slight tweak

* Slight tweak

* Remove no longer needed task methods

* Update scope for IncrementDoneCount

* Create helper method Client::GetPartyMembers() and add client->HasTaskState()

* Move HandleUpdateTasksOnKill responsibility to TaskManager

* Remove unnecessary pointer
This commit is contained in:
Chris Miles
2021-10-01 22:57:00 -05:00
committed by GitHub
parent bb5c491794
commit 9a413cf553
8 changed files with 140 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client.h
+4 -9
View File
@@ -1040,6 +1040,7 @@ public:
void SendTaskRequestCooldownTimerMessage();
void StartTaskRequestCooldownTimer();
inline ClientTaskState *GetTaskState() const { return task_state; }
inline bool HasTaskState() { if (task_state) { return true; } return false; }
inline void CancelTask(int task_index, TaskType task_type)
{
if (task_state) {
@@ -1094,15 +1095,6 @@ public:
);
}
}
inline void UpdateTasksOnKill(int npc_type_id)
{
if (task_state) {
task_state->UpdateTasksOnKill(
this,
npc_type_id
);
}
}
inline void UpdateTasksForItem(
TaskActivityType activity_type,
int item_id,
@@ -1281,6 +1273,9 @@ public:
bool m_shared_task_update = false;
bool m_requested_shared_task_removal = false;
std::vector<Client*> GetPartyMembers();
void HandleUpdateTasksOnKill(uint32 npc_type_id);
inline const EQ::versions::ClientVersion ClientVersion() const { return m_ClientVersion; }
inline const uint32 ClientVersionBit() const { return m_ClientVersionBit; }
inline void SetClientVersion(EQ::versions::ClientVersion client_version) { m_ClientVersion = client_version; }