pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-02-15 20:12:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tweak some stuff in world

Browse Source
This commit is contained in:
Michael Cook (mackal) 2019-05-25 21:52:21 -04:00
parent 408ce4650f
commit 977c3ca3dc
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
world/shared_tasks.cpp
View File

@ -18,7 +18,7 @@ void SharedTaskManager::HandleTaskRequest(ServerPacket *pack)
/* /*
* Things done in zone: * Things done in zone:
* Verified we were requesting a shared task * Verified we were requesting a shared task
* Verified leader has a slot available * Verified leader has a slot available (guess we should double check this one)
* Verified leader met level reqs * Verified leader met level reqs
* Verified repeatable or not completed (not doing that here?) * Verified repeatable or not completed (not doing that here?)
* Verified leader doesn't have a lock out * Verified leader doesn't have a lock out
@ -75,6 +75,11 @@ void SharedTaskManager::HandleTaskRequest(ServerPacket *pack)
return; return;
} }
if (!cle_leader->HasFreeSharedTaskSlot()) { // they have a task already ...
tasks.erase(ret.first);
return;
}
auto &task = ret.first->second; auto &task = ret.first->second;
task.AddMember(leader_name, cle_leader, true); task.AddMember(leader_name, cle_leader, true);
@ -144,6 +149,8 @@ void SharedTaskManager::HandleTaskRequest(ServerPacket *pack)
} }
} }
// this will also prevent any of these clients from requesting or being added to another, lets do it now before we tell zone
task.SetCLESharedTasks();
// fire off to zone we're done! // fire off to zone we're done!
SerializeBuffer buf(10 + 10 * players.size()); SerializeBuffer buf(10 + 10 * players.size());
buf.WriteInt32(id); // shared task's ID buf.WriteInt32(id); // shared task's ID
@ -156,7 +163,6 @@ void SharedTaskManager::HandleTaskRequest(ServerPacket *pack)
zoneserver_list.SendPacket(cle_leader->zone(), cle_leader->instance(), reply); zoneserver_list.SendPacket(cle_leader->zone(), cle_leader->instance(), reply);
safe_delete(reply); safe_delete(reply);
task.SetCLESharedTasks();
return; return;
} }