mirror of
https://github.com/EQEmu/Server.git
synced 2026-09-03 13:36:36 +00:00
[Shared Tasks] Shared Tasks System Implementation (#1451)
* Shared tasks WIP; lots of logging; shared tasks and tasks work internally the same for now; lots to cleanup yet * Update task_manager.cpp * Add tables * World message handler * Zone message handler * More messaging * More rearranging * Task creation work (wip) * Tweaks * Decoupled things, added a shared task manager, moved logic to the manager, created the shared task object, now creating a sense of state on creation and members, zero validation, happy path * Cleanup unnecessary getter * More work on shared task persistence and state loading * Add int64 support into repositories * More state handling, creation loads all tables * Wrap up shared task state creation and removal * Move more lookup operations to preloading (memory). Restore shared task state during world bootup * Implement shared task updates * Add members other than just leader in task confirmations * Update shared_task_manager.cpp * Hook task cancellation for shared task removal (middleware) * Remove dynamic_zone_id from SharedTasks model in repositories (for now) since we will likely be one to many with DZ objects * Get members to show up in the window on creation * Add opcodes, cleanup * Add opcode handlers * Split some methods out, self removal of shared task and updating members * Implement offline shared task sync * Style changes * Send memberlist on initial login; implement remove player from shared task window * Refactorings, cleanup * Implement make leader in shared tasks window * Implement add player, sync shared task state after add * Add opcodes for remaining clients * Shared task invite dialogue window implementation and response handling (including validation) * Logging * Remove comment * Some cleanup * Pass NPC context through shared task request logic * Remove extra SharedTaskMember fields * Add message constants * Remove static * Only use dz for expedition request This passes expedition creation parameters through DynamicZone instead of injecting ExpeditionRequest since it can hold creation data now * Store expedition leader on dz This shifts to using the leader object that exists in the core dynamic zone object. It will be moved to the dynamic zone table later with other columns that should just be on the dz to make loading easier. Expeditions are probably the only dz type that will use this for window updates and command auth. Other systems on live do fill the window but don't keep it updated * Store expedition name on dz This uses the name stored on dz (for window packets) instead of duplicating it. This will be moved completely to dz table later * Store uuid on dynamic zone This lets dynamic zones generate the uuid instead of expeditions. Other dz type systems may want to make use of this. Lockouts should also be moved to dynamic zones at some point in the future so this will be necessary for that * Move expedition db columns to dz These columns should just belong to the core dynamic zone. This will simplify loading from the database and in the future a separate expedition table may no longer be necessary. * Move window packet methods to dz It makes more sense for these methods to be in the core This will also allow support for other systems to use the window, though live behavior that updates the window for shared task missions when not in an expedition is likely unintended since it's not updated on changes. * Store dynamic zone ids on clients These will now be used for client dynamic zone lookups to remove dependency on any dz type system caches * Move member management to dz This moves server messaging for adding and removing members to internal dynamic zone methods Set default dz member status to Unknown * Move member status caching to dz This moves world member status caching into internal dz methods Zone member updates for created expeditions are now async and sent after world replies with member statuses. Prior to this two memberlist packets were sent to members in other zones on creation to update statuses. This also fixes a bug with member statuses being wrong for offline raid members in the zone that created an expedition. Note that live kicks offline players out of raids so this is only to support emu behavior. * Move member status updates to dz * Set dz member status on all client dzs This also renames the zone entry dz update method and moves window update to a dynamic zone method. Eventually expedition components should just be merged with dz and handled as another dz type * Save instance safe return on characters Add character_instance_safereturns table and repository Previously dz safe return only worked for online characters via the dz kicktimer or offline characters with a workaround that moved them when an expedition was deleted. There were various edge cases that would cause characters to be moved to bind instead (succoring after removal, camping before kick timer, removed while offline, bulk kickplayers removal with some offline) This updates a character's instance safereturn every time they enter a zone. If a character enters world in an instance that expired or are no longer part of they'll be moved to their instance safereturn (if the safereturn data is for the same zone-instance). Bind is still a fallback This may also be used for non-dz instancing so it's named generically This removes the expedition MoveMembersToSafeReturn workaround which deprecates the is_current_member column of dynamic_zone_members and will be removed in a followup patch. * Remove is_current_member from dz members This was only being used in the workaround to move past members to dz safereturns if they were still inside the dz but not online * Let dz check leader in world This moves expedition leader processing in world to the dynamic zone. This is a step in phasing out the separate expedition class for things that can run off the dynamic zone core with simple dz type checks This greatly simplifies checking leader on member and status changes without needing callbacks. Other dz types that may use the dz leader object can just handle it directly on the dz the same as expeditions * Let dz handle member expire warnings This moves expire warning checks to dz. This will make it easier for other dz types to issue expire warnings if needed * Use separate dynamic zone cache Dynamic zones are no longer member objects of expeditions and have been placed into their own cache. This was done so other dz types can be cached without relying on their systems. Client and zone dz Lookups are now independent of any system This continues the process of phasing out a separate expedition cache. Eventually expeditions can just be run directly as dynamic zones internally with a few dz type checks. Add dz serialization methods (cereal) for passing server dz creation Modify #dz list to show cache and database separately. Also adds #dz cache reload. This command will reload expeditions too since they currently hold references to the dz in their own zone cache. Add a dynamic zone processing class to world to process all types and move expedition processing to it * Move expedition makeleader processing to dz * Let dz handle expedition deletions This removes the need for separate expedition cache in world This will greatly simplify world dynamic zone caching and processing. Dynamic zones that are expeditions can just handle this directly. Once lockouts and other components are completely moved to dynamic zones the separate expedition cache in zone will also no longer be necessary * Remove ExpeditionBase class Since world no longer caches expeditions this will not be necessary * Fix windows compile * Implement task dz creation Prototype dz creation for shared tasks * Add and remove shared task members from dz Also keep leader updated (used in choose zone window) * Fix client crash on failed shared task * Fix linux compile and warning * Check client nullptr for dz message This was accidently removed when expedition makeleader was moved * Disable dz creation for solo tasks * Add shared task repository headers to CMakeLists * Add shared task dynamic zones table * Add shared task dz database persistence * Get members from db on shared task dz creation This fixes a case where removing a member from a shared task dz would fail if the member's name was empty. This could happen if the shared task dz was created while a member was offline. This also changes the dz member removal method to only check id. It might be possible to change all dz member validations to only check ids since names are primarily for window updates, but shared task dz member names need to be non-empty anyway to support possible live-like dz window usage in the future. * Add character message methods to world Add simple and eqstr message methods to ClientList Add shared task manager methods to message all members or leader * Add SyncClientSharedTaskState and nested sync strategies to cover M3 work * Fix whitespace * Implement task request cooldown timer This implements the task request cooldown (15 seconds) that live uses when a task is accepted. This will also need to be set when shared tasks are offered (likely due to additional group/raid validations) * Implement shared task selector validation This implements the validation and filtering that occurs before the task selection window is sent to a client for shared tasks To keep things live-like, task selectors that contain a shared task will be run through shared task validation and drop non-shared tasks. Live doesn't mix types in task selections and this makes validation simpler. Also note that live sends shared task selectors via a different opcode than solo tasks but that has not been implemented yet * Add separate shared task select opcodes Live uses separate opcodes for solo and shared task selection windows * Convert ActivityType to enum class * Refactor task selector serialization This adds serializer methods to task and task objective structs for the task selection windows. This combines the duplicate task selector methods to reduce code duplication and simplify serialization * Add shared task selector This sends shared task selection window using the shared task specific opcode and adds an opcode handler for shared task accepts which are sent by client in response to setting selection window to shared task type. * Refactor task objective serialization This adds a serialization method to the task objective struct for serializing objectives in the window list and combines the separate client-based methods to reduce duplicated code. * Add task level spread and player count columns * Implement shared task accept validation This adds a common method for shared task character request queries * Add task replay and request timer columns * Add character task timers table * Use shared task accept time on clients This overrides client task accept time with shared task's creation time. This is needed for accurate window task timers and lockout messages especially for characters added to shared tasks post creation * Implement task timer lockouts This implements replay and request task timers for solo and shared tasks * Add solo and shared task timer validation * Remove logging of padding array This gets interpreted as a c string which may not be null terminated * Implement /kickplayers task This also fixes current CancelTask behavior for leader which was performing kickplayers functionality through the remove task button * Implement /taskquit command * Implement shared task invite validation Remove active invitation before invite accept validation * Remove local client db persistence during SyncClientSharedTaskRemoveLocalIfNotExists * Add missing accept time arg to assign task * Only validate non-zero task invite requirements * Fix task error log crash * Separate task cooldown timer messaging * Use method to check for client shared task * Avoid unneeded task invite validation query Only need to query character data for levels for non-zero level spread * Implement /tasktimers command May want to add some type of throttled caching mechanism for this in the future * Add /tasktimers rate limiter * Intercept shared task completion; more work to come * Change SharedTaskActivityState and SharedTasks time objects to datetime * Add updated_time updates to SharedTaskActivities * Mark shared tasks as complete when all activities are completed * Save a database query on shared task completion and use the active record in memory * Don't record shared task completions to the quest log * Implement RecordSharedTaskCompletion, add tables, repositories * Update shared_task_manager.cpp * Update shared_task_manager.cpp * Add shared task replay timers This is still not feature complete. On live any past members that ever joined the shared task will receive a replay timer when it's completed * Create FindCharactersInSharedTasks that searches through memory * Remove namespace shorthand and formatting * More minor cleanup * Implement PurgeAllSharedTasks via #task command * Add #task purgetimers * Decrease m_keepalive time between processes * Remove type ordering in /tasktimer query * Add comment for task packet reward multiplier This is likely a reward multiplier that changes text color based on value to represent any scaled bonus or penalty * Add replay timers to past members This implements the live behavior that adds replay timers to any previous member of a shared task. This likely exists to avoid possible exploits. Shared task member history is stored in memory and is used to assign replay timers. This history will be lost on world crashes or restarts but is simpler than saving past member state in database. This also makes world send shared task replay timer messages since past members need to be messaged now * Move PurgeTaskTimers client method to tasks.cpp * Remove dz members when purging shared tasks Server dz states need to be updated before shared tasks are deleted * Use exact name in shared task invites This removes the wildcards from shared task invite character queries which was sometimes selecting the wrong character Taskadd validation is called even for invalid characters to allow for proper messages to occur * Clear declined active shared task invitations This also notifies leader for declined shared task invites * Store shared task member names This adds back the character name field to SharedTaskMember. This should make serialization easier in the future and reduce database lookups when names are needed for /task commands * Implement /taskplayerlist command * Replace queries with member name lookups Now that shared task members store names these queries are unnecessary This also adds not-a-member messages for /taskremove and /taskmakeleader * Implement shared task member change packet This avoids sending the full member list to members when a single member is added or removed and lets the client generate chat messages for it. * Serialize shared task member list from world This uses cereal to serialize the full member list from world and removes the zone query workarounds * Initialize client task state array This was causing sql query errors on client state reloads The client task information array was uninitialized resulting in being filled with 0xcdcdcdcd values in msvc debug builds. Under release builds this may have resulted in indeterminate values A better fix would be to refactor some of this legacy code * Add shared task command messages Add messages for non-leader task commands This adds taskadd, taskremove, taskmakeleader, and taskquit messages The leader receives double messages for taskremove like live due to the client generated message as well as the explicit one. It also receives double server messages if the leader /taskremoves self. * Replace some task messages with eqstrs This also updates to use live colors * Avoid shared task invite leader lookup query Since member names are stored now this query is also unnecessary * Avoid reloading client state on shared task accept This was unnecessarily reloading client task state when added to a shared task. This also resulted in all active tasks being resent to shared task members on creation. The shared task itself is the only task that needs to be sent which is handled by AcceptNewTask. * Remove active shared task invite on zone Live doesn't re-send shared task invites after zoning like it does for expeditions so there's no need to keep these around. This fixes active invitations never getting reset on characters that zone or go offline. * Choose new shared task leader if leader removed * Add separate shared task kickplayers method * Enable EVENT_CAST_ON for clients This will be required for a shared task objective (The Creator) in DoN * Revert "Avoid reloading client state on shared task accept" This reverts commit 3af14fee2de8b109ffb6c2b2fc67731e1531a665. Without this clients added to a task after some objectives have been completed don't get updated state. Will need to investigate this later * Disallow looting inside a dz by non-members Non-members of a dynamic zone should not be allowed to loot npcs inside it. This should have been disabled for expeditions already but was still allowed due to an oversight (or live behavior changed). This is less critical for shared tasks since members can be added and removed at will without leaving a dz but still an important feature. * Change load where criteria * Increase task completion emote column size * Use eqstr for task item reward message * Implement radiant and ebon crystal rewards This adds reward columns for radiant and ebon crystals to the tasks table and updates task description serialization * Send task completion emote before rewards This matches live and makes it a little easier to see item rewards when tasks have a long completion emote. This also changes it to send via the same normal message opcode that live uses. * Do not send a shared task in completed task history * Allow EVENT_TASK_STAGE_COMPLETE for quest goals This invokes event_task_stage_complete for task elements flagged with a quest controlled goal method. It should be expected behavior that a completed task stage always fires this event even if a quest controls it * Add SyncSharedTaskZoneClientDoneCountState * Swap return for continue in this case * Formatting * Simplify * Formatting * Formatting * Formatting * Remove errant check * Formatting, add setter for shared tasks * Remove debugging * Comments in PR * More PR follow up * Formatting * Cleanup * Update packet comments * Comments * More cleanup * Send command error message if not in shared task /taskadd is the only command with this feedback on live. Newer live clients also generate this instead of the server sending the message * Implement expire_time on SharedTask object and add a purge on world bootup * Comment * Add SyncClientSharedTaskStateToLocal where clients fall out of sync and no longer have a task locally * Clamp shared task activity updates to max done count and discard updates out of bounds * Fix packet send * Revert packet send * Adjust clamping OOO for completed time check. Add completed tables to purge truncation * Refactor kill update logic so that shared task kill updates only update one client instead of all clients * Cleanup how we're checking for active tasks * Forward task sets that contain shared tasks This forwards task sets that contain a shared task to shared task selector validation like normal task selectors * Change eqstr for empty solo task offers This is the message live appears to use if all task offers are filtered out by solo task validation * Fix max active tasks client message This message starts at the third argument. It was maybe intended to be an npc say message but live just sends it as a normal eqstr with the first two arguments nulled. * Load client task state after zoning complete This fixes a possible race where a character removed from a shared task while zoning would be stuck with an incorrect character activities state after zoning was completed. This was caused by the character loading task state to early on zone entry but never receiving the remove player message from world since they are missing from the world cle until zoning is completed. Loading client state after zone connection is completed makes sure the client has the latest state and available to the world cle * Send message to clients removed while zoning This message should usually only be sent to characters that were removed from a shared task while zoning but will occur for any sync state removals where a message wouldn't have already occured. * Post rebase fix * HG comment for checking active task * Addressing HG comments around zeroing out a shared task id * Remove errant comment * Post rebase database manifest updates * Update eqemu_logsys_log_aliases.h * More rebase catches * Bump database version for last commit Co-authored-by: hg <4683435+hgtw@users.noreply.github.com>
This commit is contained in:
Chris Miles
GitHub
@@ -8,12 +8,11 @@ SET(world_sources
|
||||
clientlist.cpp
|
||||
console.cpp
|
||||
dynamic_zone.cpp
|
||||
dynamic_zone_manager.cpp
|
||||
eql_config.cpp
|
||||
eqemu_api_world_data_service.cpp
|
||||
expedition.cpp
|
||||
expedition_database.cpp
|
||||
expedition_message.cpp
|
||||
expedition_state.cpp
|
||||
launcher_link.cpp
|
||||
launcher_list.cpp
|
||||
lfplist.cpp
|
||||
@@ -21,6 +20,8 @@ SET(world_sources
|
||||
login_server_list.cpp
|
||||
main.cpp
|
||||
queryserv.cpp
|
||||
shared_task_manager.cpp
|
||||
shared_task_world_messaging.cpp
|
||||
ucs.cpp
|
||||
web_interface.cpp
|
||||
web_interface_eqw.cpp
|
||||
@@ -44,18 +45,19 @@ SET(world_headers
|
||||
clientlist.h
|
||||
console.h
|
||||
dynamic_zone.h
|
||||
dynamic_zone_manager.h
|
||||
eql_config.h
|
||||
eqemu_api_world_data_service.h
|
||||
expedition.h
|
||||
expedition_database.h
|
||||
expedition_message.h
|
||||
expedition_state.h
|
||||
launcher_link.h
|
||||
launcher_list.h
|
||||
lfplist.h
|
||||
login_server.h
|
||||
login_server_list.h
|
||||
queryserv.h
|
||||
shared_task_manager.h
|
||||
shared_task_world_messaging.h
|
||||
sof_char_create_data.h
|
||||
ucs.h
|
||||
web_interface.h
|
||||
|
||||
+12
-30
@@ -121,7 +121,7 @@ Client::Client(EQStreamInterface* ieqs)
|
||||
|
||||
m_ClientVersion = eqs->ClientVersion();
|
||||
m_ClientVersionBit = EQ::versions::ConvertClientVersionToClientVersionBit(m_ClientVersion);
|
||||
|
||||
|
||||
numclients++;
|
||||
}
|
||||
|
||||
@@ -833,19 +833,12 @@ bool Client::HandleEnterWorldPacket(const EQApplicationPacket *app) {
|
||||
|
||||
if(instance_id > 0)
|
||||
{
|
||||
if(!database.VerifyInstanceAlive(instance_id, GetCharID()))
|
||||
if (!database.VerifyInstanceAlive(instance_id, GetCharID()) ||
|
||||
!database.VerifyZoneInstance(zone_id, instance_id))
|
||||
{
|
||||
zone_id = database.MoveCharacterToBind(charid);
|
||||
zone_id = database.MoveCharacterToInstanceSafeReturn(charid, zone_id, instance_id);
|
||||
instance_id = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
if(!database.VerifyZoneInstance(zone_id, instance_id))
|
||||
{
|
||||
zone_id = database.MoveCharacterToBind(charid);
|
||||
instance_id = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(!is_player_zoning) {
|
||||
@@ -1154,34 +1147,23 @@ void Client::EnterWorld(bool TryBootup) {
|
||||
return;
|
||||
|
||||
ZoneServer* zone_server = nullptr;
|
||||
if(instance_id > 0)
|
||||
if (instance_id > 0)
|
||||
{
|
||||
if(database.VerifyInstanceAlive(instance_id, GetCharID()))
|
||||
{
|
||||
if(database.VerifyZoneInstance(zone_id, instance_id))
|
||||
{
|
||||
zone_server = zoneserver_list.FindByInstanceID(instance_id);
|
||||
}
|
||||
else
|
||||
{
|
||||
instance_id = 0;
|
||||
zone_server = nullptr;
|
||||
database.MoveCharacterToBind(GetCharID());
|
||||
TellClientZoneUnavailable();
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
if (!database.VerifyInstanceAlive(instance_id, GetCharID()) ||
|
||||
!database.VerifyZoneInstance(zone_id, instance_id))
|
||||
{
|
||||
instance_id = 0;
|
||||
zone_server = nullptr;
|
||||
database.MoveCharacterToBind(GetCharID());
|
||||
database.MoveCharacterToInstanceSafeReturn(GetCharID(), zone_id, instance_id);
|
||||
TellClientZoneUnavailable();
|
||||
return;
|
||||
}
|
||||
|
||||
zone_server = zoneserver_list.FindByInstanceID(instance_id);
|
||||
}
|
||||
else
|
||||
{
|
||||
zone_server = zoneserver_list.FindByZoneID(zone_id);
|
||||
}
|
||||
|
||||
const char *zone_name = ZoneName(zone_id, true);
|
||||
if (zone_server) {
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
#include "clientlist.h"
|
||||
#include "login_server.h"
|
||||
#include "login_server_list.h"
|
||||
#include "shared_task_manager.h"
|
||||
#include "worlddb.h"
|
||||
#include "zoneserver.h"
|
||||
#include "world_config.h"
|
||||
@@ -30,6 +31,7 @@ extern uint32 numplayers;
|
||||
extern LoginServerList loginserverlist;
|
||||
extern ClientList client_list;
|
||||
extern volatile bool RunLoops;
|
||||
extern SharedTaskManager shared_task_manager;
|
||||
|
||||
/**
|
||||
* @param in_id
|
||||
@@ -249,6 +251,8 @@ void ClientListEntry::LeavingZone(ZoneServer *iZS, CLE_Status iOnline)
|
||||
}
|
||||
SetOnline(iOnline);
|
||||
|
||||
shared_task_manager.RemoveActiveInvitationByCharacterID(CharID());
|
||||
|
||||
if (pzoneserver) {
|
||||
pzoneserver->RemovePlayer();
|
||||
LSUpdate(pzoneserver);
|
||||
|
||||
+141
-10
@@ -332,30 +332,91 @@ void ClientList::CLCheckStale() {
|
||||
}
|
||||
}
|
||||
|
||||
void ClientList::ClientUpdate(ZoneServer* zoneserver, ServerClientList_Struct* scl) {
|
||||
LinkedListIterator<ClientListEntry*> iterator(clientlist);
|
||||
ClientListEntry* cle;
|
||||
void ClientList::ClientUpdate(ZoneServer *zoneserver, ServerClientList_Struct *scl)
|
||||
{
|
||||
LinkedListIterator<ClientListEntry *> iterator(clientlist);
|
||||
ClientListEntry *cle;
|
||||
iterator.Reset();
|
||||
while(iterator.MoreElements()) {
|
||||
while (iterator.MoreElements()) {
|
||||
if (iterator.GetData()->GetID() == scl->wid) {
|
||||
cle = iterator.GetData();
|
||||
if (scl->remove == 2){
|
||||
if (scl->remove == 2) {
|
||||
cle->LeavingZone(zoneserver, CLE_Status::Offline);
|
||||
}
|
||||
else if (scl->remove == 1)
|
||||
else if (scl->remove == 1) {
|
||||
cle->LeavingZone(zoneserver, CLE_Status::Zoning);
|
||||
else
|
||||
}
|
||||
else {
|
||||
cle->Update(zoneserver, scl);
|
||||
}
|
||||
return;
|
||||
}
|
||||
iterator.Advance();
|
||||
}
|
||||
if (scl->remove == 2)
|
||||
if (scl->remove == 2) {
|
||||
cle = new ClientListEntry(GetNextCLEID(), zoneserver, scl, CLE_Status::Online);
|
||||
else if (scl->remove == 1)
|
||||
}
|
||||
else if (scl->remove == 1) {
|
||||
cle = new ClientListEntry(GetNextCLEID(), zoneserver, scl, CLE_Status::Zoning);
|
||||
else
|
||||
}
|
||||
else {
|
||||
cle = new ClientListEntry(GetNextCLEID(), zoneserver, scl, CLE_Status::InZone);
|
||||
}
|
||||
|
||||
LogClientListDetail(
|
||||
"[ClientUpdate] "
|
||||
" remove [{}]"
|
||||
" wid [{}]"
|
||||
" IP [{}]"
|
||||
" zone [{}]"
|
||||
" instance_id [{}]"
|
||||
" Admin [{}]"
|
||||
" charid [{}]"
|
||||
" name [{}]"
|
||||
" AccountID [{}]"
|
||||
" AccountName [{}]"
|
||||
" LSAccountID [{}]"
|
||||
" lskey [{}]"
|
||||
" race [{}]"
|
||||
" class_ [{}]"
|
||||
" level [{}]"
|
||||
" anon [{}]"
|
||||
" tellsoff [{}]"
|
||||
" guild_id [{}]"
|
||||
" LFG [{}]"
|
||||
" gm [{}]"
|
||||
" ClientVersion [{}]"
|
||||
" LFGFromLevel [{}]"
|
||||
" LFGToLevel [{}]"
|
||||
" LFGMatchFilter [{}]"
|
||||
" LFGComments [{}]",
|
||||
scl->remove,
|
||||
scl->wid,
|
||||
scl->IP,
|
||||
scl->zone,
|
||||
scl->instance_id,
|
||||
scl->Admin,
|
||||
scl->charid,
|
||||
scl->name,
|
||||
scl->AccountID,
|
||||
scl->AccountName,
|
||||
scl->LSAccountID,
|
||||
scl->lskey,
|
||||
scl->race,
|
||||
scl->class_,
|
||||
scl->level,
|
||||
scl->anon,
|
||||
scl->tellsoff,
|
||||
scl->guild_id,
|
||||
scl->LFG,
|
||||
scl->gm,
|
||||
scl->ClientVersion,
|
||||
scl->LFGFromLevel,
|
||||
scl->LFGToLevel,
|
||||
scl->LFGMatchFilter,
|
||||
scl->LFGComments
|
||||
);
|
||||
|
||||
clientlist.Insert(cle);
|
||||
zoneserver->ChangeWID(scl->charid, cle->GetID());
|
||||
}
|
||||
@@ -1508,3 +1569,73 @@ void ClientList::GetClientList(Json::Value &response)
|
||||
Iterator.Advance();
|
||||
}
|
||||
}
|
||||
|
||||
void ClientList::SendCharacterMessage(uint32_t character_id, int chat_type, const std::string& message)
|
||||
{
|
||||
auto character = FindCLEByCharacterID(character_id);
|
||||
SendCharacterMessage(character, chat_type, message);
|
||||
}
|
||||
|
||||
void ClientList::SendCharacterMessage(const std::string& character_name, int chat_type, const std::string& message)
|
||||
{
|
||||
auto character = FindCharacter(character_name.c_str());
|
||||
SendCharacterMessage(character, chat_type, message);
|
||||
}
|
||||
|
||||
void ClientList::SendCharacterMessage(ClientListEntry* character, int chat_type, const std::string& message)
|
||||
{
|
||||
if (!character || !character->Server())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
uint32_t pack_size = sizeof(CZMessagePlayer_Struct);
|
||||
auto pack = std::make_unique<ServerPacket>(ServerOP_CZMessagePlayer, pack_size);
|
||||
auto buf = reinterpret_cast<CZMessagePlayer_Struct*>(pack->pBuffer);
|
||||
buf->type = chat_type;
|
||||
strn0cpy(buf->character_name, character->name(), sizeof(buf->character_name));
|
||||
strn0cpy(buf->message, message.c_str(), sizeof(buf->message));
|
||||
|
||||
character->Server()->SendPacket(pack.get());
|
||||
}
|
||||
|
||||
void ClientList::SendCharacterMessageID(uint32_t character_id,
|
||||
int chat_type, int eqstr_id, std::initializer_list<std::string> args)
|
||||
{
|
||||
auto character = FindCLEByCharacterID(character_id);
|
||||
SendCharacterMessageID(character, chat_type, eqstr_id, args);
|
||||
}
|
||||
|
||||
void ClientList::SendCharacterMessageID(const std::string& character_name,
|
||||
int chat_type, int eqstr_id, std::initializer_list<std::string> args)
|
||||
{
|
||||
auto character = FindCharacter(character_name.c_str());
|
||||
SendCharacterMessageID(character, chat_type, eqstr_id, args);
|
||||
}
|
||||
|
||||
void ClientList::SendCharacterMessageID(ClientListEntry* character,
|
||||
int chat_type, int eqstr_id, std::initializer_list<std::string> args)
|
||||
{
|
||||
if (!character || !character->Server())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
SerializeBuffer serialized_args;
|
||||
for (const auto& arg : args)
|
||||
{
|
||||
serialized_args.WriteString(arg);
|
||||
}
|
||||
|
||||
uint32_t args_size = static_cast<uint32_t>(serialized_args.size());
|
||||
uint32_t pack_size = sizeof(CZClientMessageString_Struct) + args_size;
|
||||
auto pack = std::make_unique<ServerPacket>(ServerOP_CZClientMessageString, pack_size);
|
||||
auto buf = reinterpret_cast<CZClientMessageString_Struct*>(pack->pBuffer);
|
||||
buf->string_id = eqstr_id;
|
||||
buf->chat_type = chat_type;
|
||||
strn0cpy(buf->character_name, character->name(), sizeof(buf->character_name));
|
||||
buf->args_size = args_size;
|
||||
memcpy(buf->args, serialized_args.buffer(), serialized_args.size());
|
||||
|
||||
character->Server()->SendPacket(pack.get());
|
||||
}
|
||||
|
||||
@@ -72,6 +72,13 @@ public:
|
||||
|
||||
void GetClientList(Json::Value &response);
|
||||
|
||||
void SendCharacterMessage(uint32_t character_id, int chat_type, const std::string& message);
|
||||
void SendCharacterMessage(const std::string& character_name, int chat_type, const std::string& message);
|
||||
void SendCharacterMessage(ClientListEntry* character, int chat_type, const std::string& message);
|
||||
void SendCharacterMessageID(uint32_t character_id, int chat_type, int eqstr_id, std::initializer_list<std::string> args = {});
|
||||
void SendCharacterMessageID(const std::string& character_name, int chat_type, int eqstr_id, std::initializer_list<std::string> args = {});
|
||||
void SendCharacterMessageID(ClientListEntry* character, int chat_type, int eqstr_id, std::initializer_list<std::string> args = {});
|
||||
|
||||
private:
|
||||
void OnTick(EQ::Timer *t);
|
||||
inline uint32 GetNextCLEID() { return NextCLEID++; }
|
||||
|
||||
+237
-24
@@ -1,12 +1,14 @@
|
||||
#include "dynamic_zone.h"
|
||||
#include "expedition.h"
|
||||
#include "expedition_state.h"
|
||||
#include "cliententry.h"
|
||||
#include "clientlist.h"
|
||||
#include "dynamic_zone_manager.h"
|
||||
#include "worlddb.h"
|
||||
#include "zonelist.h"
|
||||
#include "zoneserver.h"
|
||||
#include "../common/eqemu_logsys.h"
|
||||
#include "../common/repositories/instance_list_repository.h"
|
||||
|
||||
extern ClientList client_list;
|
||||
extern ZSList zoneserver_list;
|
||||
|
||||
Database& DynamicZone::GetDatabase()
|
||||
@@ -14,17 +16,72 @@ Database& DynamicZone::GetDatabase()
|
||||
return database;
|
||||
}
|
||||
|
||||
bool DynamicZone::SendServerPacket(ServerPacket* packet)
|
||||
{
|
||||
return zoneserver_list.SendPacket(packet);
|
||||
}
|
||||
|
||||
DynamicZone* DynamicZone::FindDynamicZoneByID(uint32_t dz_id)
|
||||
{
|
||||
auto expedition = expedition_state.GetExpeditionByDynamicZoneID(dz_id);
|
||||
if (expedition)
|
||||
auto dz = dynamic_zone_manager.dynamic_zone_cache.find(dz_id);
|
||||
if (dz != dynamic_zone_manager.dynamic_zone_cache.end())
|
||||
{
|
||||
return &expedition->GetDynamicZone();
|
||||
return dz->second.get();
|
||||
}
|
||||
// todo: other system caches
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void DynamicZone::ChooseNewLeader()
|
||||
{
|
||||
if (m_members.empty() || !m_choose_leader_cooldown_timer.Check())
|
||||
{
|
||||
m_choose_leader_needed = true;
|
||||
return;
|
||||
}
|
||||
|
||||
auto it = std::find_if(m_members.begin(), m_members.end(), [&](const DynamicZoneMember& member) {
|
||||
if (member.id != GetLeaderID() && member.IsOnline()) {
|
||||
auto member_cle = client_list.FindCLEByCharacterID(member.id);
|
||||
return (member_cle && member_cle->GetOnline() == CLE_Status::InZone);
|
||||
}
|
||||
return false;
|
||||
});
|
||||
|
||||
if (it == m_members.end())
|
||||
{
|
||||
// no online members found, fallback to choosing any member
|
||||
it = std::find_if(m_members.begin(), m_members.end(),
|
||||
[&](const DynamicZoneMember& member) { return member.id != GetLeaderID(); });
|
||||
}
|
||||
|
||||
if (it != m_members.end() && SetNewLeader(it->id))
|
||||
{
|
||||
m_choose_leader_needed = false;
|
||||
}
|
||||
}
|
||||
|
||||
bool DynamicZone::SetNewLeader(uint32_t member_id)
|
||||
{
|
||||
auto new_leader = GetMemberData(member_id);
|
||||
if (!new_leader.IsValid())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
LogDynamicZonesDetail("Replacing dz [{}] leader [{}] with [{}]", GetID(), GetLeaderName(), new_leader.name);
|
||||
SetLeader(new_leader, true);
|
||||
SendZonesLeaderChanged();
|
||||
return true;
|
||||
}
|
||||
|
||||
void DynamicZone::CheckLeader()
|
||||
{
|
||||
if (m_choose_leader_needed)
|
||||
{
|
||||
ChooseNewLeader();
|
||||
}
|
||||
}
|
||||
|
||||
DynamicZoneStatus DynamicZone::Process()
|
||||
{
|
||||
DynamicZoneStatus status = DynamicZoneStatus::Normal;
|
||||
@@ -47,9 +104,24 @@ DynamicZoneStatus DynamicZone::Process()
|
||||
}
|
||||
}
|
||||
|
||||
if (GetType() == DynamicZoneType::Expedition && status != DynamicZoneStatus::ExpiredEmpty)
|
||||
{
|
||||
CheckExpireWarning();
|
||||
CheckLeader();
|
||||
}
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
void DynamicZone::SendZonesDynamicZoneDeleted()
|
||||
{
|
||||
uint32_t pack_size = sizeof(ServerDzID_Struct);
|
||||
auto pack = std::make_unique<ServerPacket>(ServerOP_DzDeleted, pack_size);
|
||||
auto buf = reinterpret_cast<ServerDzID_Struct*>(pack->pBuffer);
|
||||
buf->dz_id = GetID();
|
||||
zoneserver_list.SendPacket(pack.get());
|
||||
}
|
||||
|
||||
void DynamicZone::SetSecondsRemaining(uint32_t seconds_remaining)
|
||||
{
|
||||
auto now = std::chrono::system_clock::now();
|
||||
@@ -82,10 +154,25 @@ void DynamicZone::SendZonesDurationUpdate()
|
||||
zoneserver_list.SendPacket(pack.get());
|
||||
}
|
||||
|
||||
void DynamicZone::SendZonesLeaderChanged()
|
||||
{
|
||||
uint32_t pack_size = sizeof(ServerDzLeaderID_Struct);
|
||||
auto pack = std::make_unique<ServerPacket>(ServerOP_DzLeaderChanged, pack_size);
|
||||
auto buf = reinterpret_cast<ServerDzLeaderID_Struct*>(pack->pBuffer);
|
||||
buf->dz_id = GetID();
|
||||
buf->leader_id = GetLeaderID();
|
||||
zoneserver_list.SendPacket(pack.get());
|
||||
}
|
||||
|
||||
void DynamicZone::HandleZoneMessage(ServerPacket* pack)
|
||||
{
|
||||
switch (pack->opcode)
|
||||
{
|
||||
case ServerOP_DzCreated:
|
||||
{
|
||||
dynamic_zone_manager.CacheNewDynamicZone(pack);
|
||||
break;
|
||||
}
|
||||
case ServerOP_DzSetCompass:
|
||||
case ServerOP_DzSetSafeReturn:
|
||||
case ServerOP_DzSetZoneIn:
|
||||
@@ -110,15 +197,41 @@ void DynamicZone::HandleZoneMessage(ServerPacket* pack)
|
||||
zoneserver_list.SendPacket(pack);
|
||||
break;
|
||||
}
|
||||
case ServerOP_DzAddRemoveCharacter:
|
||||
case ServerOP_DzRemoveAllCharacters:
|
||||
case ServerOP_DzAddRemoveMember:
|
||||
{
|
||||
auto buf = reinterpret_cast<ServerDzCharacter_Struct*>(pack->pBuffer);
|
||||
ZoneServer* instance_zs = zoneserver_list.FindByInstanceID(buf->instance_id);
|
||||
if (instance_zs)
|
||||
auto buf = reinterpret_cast<ServerDzMember_Struct*>(pack->pBuffer);
|
||||
auto dz = DynamicZone::FindDynamicZoneByID(buf->dz_id);
|
||||
if (dz)
|
||||
{
|
||||
instance_zs->SendPacket(pack);
|
||||
auto status = static_cast<DynamicZoneMemberStatus>(buf->character_status);
|
||||
dz->ProcessMemberAddRemove({ buf->character_id, buf->character_name, status }, buf->removed);
|
||||
}
|
||||
zoneserver_list.SendPacket(pack);
|
||||
break;
|
||||
}
|
||||
case ServerOP_DzSwapMembers:
|
||||
{
|
||||
auto buf = reinterpret_cast<ServerDzMemberSwap_Struct*>(pack->pBuffer);
|
||||
auto dz = DynamicZone::FindDynamicZoneByID(buf->dz_id);
|
||||
if (dz)
|
||||
{
|
||||
// we add first in world so new member can be chosen if leader is removed
|
||||
auto status = static_cast<DynamicZoneMemberStatus>(buf->add_character_status);
|
||||
dz->ProcessMemberAddRemove({ buf->add_character_id, buf->add_character_name, status }, false);
|
||||
dz->ProcessMemberAddRemove({ buf->remove_character_id, buf->remove_character_name }, true);
|
||||
}
|
||||
zoneserver_list.SendPacket(pack);
|
||||
break;
|
||||
}
|
||||
case ServerOP_DzRemoveAllMembers:
|
||||
{
|
||||
auto buf = reinterpret_cast<ServerDzID_Struct*>(pack->pBuffer);
|
||||
auto dz = DynamicZone::FindDynamicZoneByID(buf->dz_id);
|
||||
if (dz)
|
||||
{
|
||||
dz->ProcessRemoveAllMembers();
|
||||
}
|
||||
zoneserver_list.SendPacket(pack);
|
||||
break;
|
||||
}
|
||||
case ServerOP_DzSetSecondsRemaining:
|
||||
@@ -131,31 +244,131 @@ void DynamicZone::HandleZoneMessage(ServerPacket* pack)
|
||||
}
|
||||
break;
|
||||
}
|
||||
case ServerOP_DzGetMemberStatuses:
|
||||
{
|
||||
auto buf = reinterpret_cast<ServerDzID_Struct*>(pack->pBuffer);
|
||||
auto dz = DynamicZone::FindDynamicZoneByID(buf->dz_id);
|
||||
if (dz)
|
||||
{
|
||||
dz->SendZoneMemberStatuses(buf->sender_zone_id, buf->sender_instance_id);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case ServerOP_DzUpdateMemberStatus:
|
||||
{
|
||||
auto buf = reinterpret_cast<ServerDzMemberStatus_Struct*>(pack->pBuffer);
|
||||
auto dz = DynamicZone::FindDynamicZoneByID(buf->dz_id);
|
||||
if (dz)
|
||||
{
|
||||
auto status = static_cast<DynamicZoneMemberStatus>(buf->status);
|
||||
dz->ProcessMemberStatusChange(buf->character_id, status);
|
||||
}
|
||||
zoneserver_list.SendPacket(pack);
|
||||
break;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
void DynamicZone::SendInstanceAddRemoveCharacter(uint32_t character_id, bool remove)
|
||||
void DynamicZone::ProcessMemberAddRemove(const DynamicZoneMember& member, bool removed)
|
||||
{
|
||||
ZoneServer* instance_zs = zoneserver_list.FindByInstanceID(GetInstanceID());
|
||||
if (instance_zs)
|
||||
DynamicZoneBase::ProcessMemberAddRemove(member, removed);
|
||||
|
||||
if (GetType() == DynamicZoneType::Expedition && removed && member.id == GetLeaderID())
|
||||
{
|
||||
auto pack = CreateServerAddRemoveCharacterPacket(character_id, remove);
|
||||
instance_zs->SendPacket(pack.get());
|
||||
ChooseNewLeader();
|
||||
}
|
||||
}
|
||||
|
||||
void DynamicZone::SendInstanceRemoveAllCharacters()
|
||||
bool DynamicZone::ProcessMemberStatusChange(uint32_t character_id, DynamicZoneMemberStatus status)
|
||||
{
|
||||
ZoneServer* instance_zs = zoneserver_list.FindByInstanceID(GetInstanceID());
|
||||
if (instance_zs)
|
||||
bool changed = DynamicZoneBase::SetInternalMemberStatus(character_id, status);
|
||||
if (changed && GetType() == DynamicZoneType::Expedition)
|
||||
{
|
||||
auto pack = CreateServerRemoveAllCharactersPacket();
|
||||
instance_zs->SendPacket(pack.get());
|
||||
// any member status update will trigger a leader fix if leader was offline
|
||||
if (GetLeader().status == DynamicZoneMemberStatus::Offline && GetMemberCount() > 1)
|
||||
{
|
||||
ChooseNewLeader();
|
||||
}
|
||||
}
|
||||
return changed;
|
||||
}
|
||||
|
||||
void DynamicZone::SendGlobalLocationChange(uint16_t server_opcode, const DynamicZoneLocation& location)
|
||||
void DynamicZone::SendZonesExpireWarning(uint32_t minutes_remaining)
|
||||
{
|
||||
auto pack = CreateServerDzLocationPacket(server_opcode, location);
|
||||
uint32_t pack_size = sizeof(ServerDzExpireWarning_Struct);
|
||||
auto pack = std::make_unique<ServerPacket>(ServerOP_DzExpireWarning, pack_size);
|
||||
auto buf = reinterpret_cast<ServerDzExpireWarning_Struct*>(pack->pBuffer);
|
||||
buf->dz_id = GetID();
|
||||
buf->minutes_remaining = minutes_remaining;
|
||||
zoneserver_list.SendPacket(pack.get());
|
||||
}
|
||||
|
||||
void DynamicZone::SendZoneMemberStatuses(uint16_t zone_id, uint16_t instance_id)
|
||||
{
|
||||
uint32_t members_count = static_cast<uint32_t>(m_members.size());
|
||||
uint32_t entries_size = sizeof(ServerDzMemberStatusEntry_Struct) * members_count;
|
||||
uint32_t pack_size = sizeof(ServerDzMemberStatuses_Struct) + entries_size;
|
||||
auto pack = std::make_unique<ServerPacket>(ServerOP_DzGetMemberStatuses, pack_size);
|
||||
auto buf = reinterpret_cast<ServerDzMemberStatuses_Struct*>(pack->pBuffer);
|
||||
buf->dz_id = GetID();
|
||||
buf->count = members_count;
|
||||
|
||||
for (int i = 0; i < m_members.size(); ++i)
|
||||
{
|
||||
buf->entries[i].character_id = m_members[i].id;
|
||||
buf->entries[i].online_status = static_cast<uint8_t>(m_members[i].status);
|
||||
}
|
||||
|
||||
zoneserver_list.SendPacket(zone_id, instance_id, pack.get());
|
||||
}
|
||||
|
||||
void DynamicZone::CacheMemberStatuses()
|
||||
{
|
||||
if (m_has_member_statuses)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// called when a new dz is cached to fill member statuses
|
||||
std::string zone_name{};
|
||||
std::vector<ClientListEntry*> all_clients;
|
||||
all_clients.reserve(client_list.GetClientCount());
|
||||
client_list.GetClients(zone_name.c_str(), all_clients);
|
||||
|
||||
for (const auto& member : m_members)
|
||||
{
|
||||
auto it = std::find_if(all_clients.begin(), all_clients.end(),
|
||||
[&](const ClientListEntry* cle) { return (cle && cle->CharID() == member.id); });
|
||||
|
||||
auto status = DynamicZoneMemberStatus::Offline;
|
||||
if (it != all_clients.end())
|
||||
{
|
||||
status = DynamicZoneMemberStatus::Online;
|
||||
if (IsSameDz((*it)->zone(), (*it)->instance()))
|
||||
{
|
||||
status = DynamicZoneMemberStatus::InDynamicZone;
|
||||
}
|
||||
}
|
||||
|
||||
SetInternalMemberStatus(member.id, status);
|
||||
}
|
||||
|
||||
m_has_member_statuses = true;
|
||||
}
|
||||
|
||||
void DynamicZone::CheckExpireWarning()
|
||||
{
|
||||
if (m_warning_cooldown_timer.Check(false))
|
||||
{
|
||||
using namespace std::chrono_literals;
|
||||
auto remaining = GetDurationRemaining();
|
||||
if ((remaining > 14min && remaining < 15min) ||
|
||||
(remaining > 4min && remaining < 5min) ||
|
||||
(remaining > 0min && remaining < 1min))
|
||||
{
|
||||
int minutes = std::chrono::duration_cast<std::chrono::minutes>(remaining).count() + 1;
|
||||
SendZonesExpireWarning(minutes);
|
||||
m_warning_cooldown_timer.Start(120000); // 2 minute cooldown after a warning
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+19
-3
@@ -2,6 +2,8 @@
|
||||
#define WORLD_DYNAMIC_ZONE_H
|
||||
|
||||
#include "../common/dynamic_zone_base.h"
|
||||
#include "../common/rulesys.h"
|
||||
#include "../common/timer.h"
|
||||
|
||||
class Database;
|
||||
class ServerPacket;
|
||||
@@ -24,18 +26,32 @@ public:
|
||||
|
||||
void SetSecondsRemaining(uint32_t seconds_remaining) override;
|
||||
|
||||
void CacheMemberStatuses();
|
||||
DynamicZoneStatus Process();
|
||||
bool SetNewLeader(uint32_t member_id);
|
||||
|
||||
protected:
|
||||
Database& GetDatabase() override;
|
||||
void SendInstanceAddRemoveCharacter(uint32_t character_id, bool remove) override;
|
||||
void SendInstanceRemoveAllCharacters() override;
|
||||
void SendGlobalLocationChange(uint16_t server_opcode, const DynamicZoneLocation& location) override;
|
||||
void ProcessMemberAddRemove(const DynamicZoneMember& member, bool removed) override;
|
||||
bool ProcessMemberStatusChange(uint32_t member_id, DynamicZoneMemberStatus status) override;
|
||||
bool SendServerPacket(ServerPacket* packet) override;
|
||||
|
||||
private:
|
||||
friend class DynamicZoneManager;
|
||||
|
||||
void CheckExpireWarning();
|
||||
void CheckLeader();
|
||||
void ChooseNewLeader();
|
||||
void SendZoneMemberStatuses(uint16_t zone_id, uint16_t instance_id);
|
||||
void SendZonesDurationUpdate();
|
||||
void SendZonesDynamicZoneDeleted();
|
||||
void SendZonesExpireWarning(uint32_t minutes_remaining);
|
||||
void SendZonesLeaderChanged();
|
||||
|
||||
bool m_is_pending_early_shutdown = false;
|
||||
bool m_choose_leader_needed = false;
|
||||
Timer m_choose_leader_cooldown_timer{ static_cast<uint32_t>(RuleI(Expedition, ChooseLeaderCooldownTime)) };
|
||||
Timer m_warning_cooldown_timer{ 1 }; // non-zero so it's enabled initially
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -0,0 +1,166 @@
|
||||
#include "dynamic_zone_manager.h"
|
||||
#include "dynamic_zone.h"
|
||||
#include "worlddb.h"
|
||||
#include "zonelist.h"
|
||||
#include "zoneserver.h"
|
||||
#include "../common/rulesys.h"
|
||||
#include "../common/repositories/expeditions_repository.h"
|
||||
#include "../common/repositories/expedition_lockouts_repository.h"
|
||||
|
||||
extern ZSList zoneserver_list;
|
||||
|
||||
DynamicZoneManager dynamic_zone_manager;
|
||||
|
||||
DynamicZoneManager::DynamicZoneManager() :
|
||||
m_process_throttle_timer{ static_cast<uint32_t>(RuleI(DynamicZone, WorldProcessRate)) }
|
||||
{
|
||||
}
|
||||
|
||||
void DynamicZoneManager::PurgeExpiredDynamicZones()
|
||||
{
|
||||
// purge when no members, instance is expired, or instance doesn't exist.
|
||||
// this prevents characters remaining members of dzs that expired while
|
||||
// server was offline but delayed instance purging hasn't cleaned yet
|
||||
auto dz_ids = DynamicZonesRepository::GetStaleIDs(database);
|
||||
|
||||
if (!dz_ids.empty())
|
||||
{
|
||||
LogDynamicZones("Purging [{}] dynamic zone(s)", dz_ids.size());
|
||||
|
||||
DynamicZoneMembersRepository::DeleteWhere(database,
|
||||
fmt::format("dynamic_zone_id IN ({})", fmt::join(dz_ids, ",")));
|
||||
DynamicZonesRepository::DeleteWhere(database,
|
||||
fmt::format("id IN ({})", fmt::join(dz_ids, ",")));
|
||||
}
|
||||
}
|
||||
|
||||
DynamicZone* DynamicZoneManager::CreateNew(
|
||||
DynamicZone& dz_request, const std::vector<DynamicZoneMember>& members)
|
||||
{
|
||||
// this creates a new dz instance and saves it to both db and cache
|
||||
uint32_t dz_id = dz_request.Create();
|
||||
if (dz_id == 0)
|
||||
{
|
||||
LogDynamicZones("Failed to create dynamic zone for zone [{}]", dz_request.GetZoneID());
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
auto dz = std::make_unique<DynamicZone>(dz_request);
|
||||
if (!members.empty())
|
||||
{
|
||||
dz->SaveMembers(members);
|
||||
dz->CacheMemberStatuses();
|
||||
}
|
||||
|
||||
LogDynamicZones("Created new dz [{}] for zone [{}]", dz_id, dz_request.GetZoneID());
|
||||
|
||||
auto pack = dz->CreateServerDzCreatePacket(0, 0);
|
||||
zoneserver_list.SendPacket(pack.get());
|
||||
|
||||
auto inserted = dynamic_zone_cache.emplace(dz_id, std::move(dz));
|
||||
return inserted.first->second.get();
|
||||
}
|
||||
|
||||
void DynamicZoneManager::CacheNewDynamicZone(ServerPacket* pack)
|
||||
{
|
||||
auto buf = reinterpret_cast<ServerDzCreateSerialized_Struct*>(pack->pBuffer);
|
||||
|
||||
auto new_dz = std::make_unique<DynamicZone>();
|
||||
new_dz->LoadSerializedDzPacket(buf->cereal_data, buf->cereal_size);
|
||||
new_dz->CacheMemberStatuses();
|
||||
|
||||
// reserialize with member statuses cached before forwarding (restore origin zone)
|
||||
auto repack = new_dz->CreateServerDzCreatePacket(buf->origin_zone_id, buf->origin_instance_id);
|
||||
|
||||
uint32_t dz_id = new_dz->GetID();
|
||||
dynamic_zone_cache.emplace(dz_id, std::move(new_dz));
|
||||
LogDynamicZones("Cached new dynamic zone [{}]", dz_id);
|
||||
|
||||
zoneserver_list.SendPacket(repack.get());
|
||||
}
|
||||
|
||||
void DynamicZoneManager::CacheAllFromDatabase()
|
||||
{
|
||||
BenchTimer bench;
|
||||
|
||||
auto dynamic_zones = DynamicZonesRepository::AllWithInstanceNotExpired(database);
|
||||
auto dynamic_zone_members = DynamicZoneMembersRepository::GetAllWithNames(database);
|
||||
|
||||
dynamic_zone_cache.clear();
|
||||
dynamic_zone_cache.reserve(dynamic_zones.size());
|
||||
|
||||
for (auto& entry : dynamic_zones)
|
||||
{
|
||||
uint32_t dz_id = entry.id;
|
||||
auto dz = std::make_unique<DynamicZone>(std::move(entry));
|
||||
|
||||
for (auto& member : dynamic_zone_members)
|
||||
{
|
||||
if (member.dynamic_zone_id == dz_id)
|
||||
{
|
||||
dz->AddMemberFromRepositoryResult(std::move(member));
|
||||
}
|
||||
}
|
||||
|
||||
// note leader status won't be updated here until leader is set by owning system (expeditions)
|
||||
dz->CacheMemberStatuses();
|
||||
|
||||
dynamic_zone_cache.emplace(dz_id, std::move(dz));
|
||||
}
|
||||
|
||||
LogDynamicZones("Caching [{}] dynamic zone(s) took [{}s]", dynamic_zone_cache.size(), bench.elapsed());
|
||||
}
|
||||
|
||||
void DynamicZoneManager::Process()
|
||||
{
|
||||
if (!m_process_throttle_timer.Check())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
std::vector<uint32_t> dynamic_zone_ids;
|
||||
|
||||
for (const auto& dz_iter : dynamic_zone_cache)
|
||||
{
|
||||
DynamicZone* dz = dz_iter.second.get();
|
||||
|
||||
// dynamic zone is not deleted until its zone has no clients to prevent exploits
|
||||
// clients should be removed by zone-based kick timers if expired but not empty
|
||||
DynamicZoneStatus status = dz->Process();
|
||||
if (status == DynamicZoneStatus::ExpiredEmpty)
|
||||
{
|
||||
LogDynamicZones("[{}] expired with [{}] members, notifying zones and deleting", dz->GetID(), dz->GetMemberCount());
|
||||
dynamic_zone_ids.emplace_back(dz->GetID());
|
||||
dz->SendZonesDynamicZoneDeleted(); // delete dz from zone caches
|
||||
}
|
||||
}
|
||||
|
||||
if (!dynamic_zone_ids.empty())
|
||||
{
|
||||
for (const auto& dz_id : dynamic_zone_ids)
|
||||
{
|
||||
dynamic_zone_cache.erase(dz_id);
|
||||
}
|
||||
|
||||
// need to look up expedition ids until lockouts are moved to dynamic zones
|
||||
std::vector<uint32_t> expedition_ids;
|
||||
auto expeditions = ExpeditionsRepository::GetWhere(database,
|
||||
fmt::format("dynamic_zone_id IN ({})", fmt::join(dynamic_zone_ids, ",")));
|
||||
|
||||
if (!expeditions.empty())
|
||||
{
|
||||
for (const auto& expedition : expeditions)
|
||||
{
|
||||
expedition_ids.emplace_back(expedition.id);
|
||||
}
|
||||
ExpeditionLockoutsRepository::DeleteWhere(database,
|
||||
fmt::format("expedition_id IN ({})", fmt::join(expedition_ids, ",")));
|
||||
}
|
||||
|
||||
ExpeditionsRepository::DeleteWhere(database,
|
||||
fmt::format("dynamic_zone_id IN ({})", fmt::join(dynamic_zone_ids, ",")));
|
||||
DynamicZoneMembersRepository::RemoveAllMembers(database, dynamic_zone_ids);
|
||||
DynamicZonesRepository::DeleteWhere(database,
|
||||
fmt::format("id IN ({})", fmt::join(dynamic_zone_ids, ",")));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
#ifndef WORLD_DYNAMIC_ZONE_MANAGER_H
|
||||
#define WORLD_DYNAMIC_ZONE_MANAGER_H
|
||||
|
||||
#include "../common/timer.h"
|
||||
#include <memory>
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
extern class DynamicZoneManager dynamic_zone_manager;
|
||||
|
||||
class DynamicZone;
|
||||
struct DynamicZoneMember;
|
||||
class ServerPacket;
|
||||
|
||||
class DynamicZoneManager
|
||||
{
|
||||
public:
|
||||
DynamicZoneManager();
|
||||
|
||||
void CacheAllFromDatabase();
|
||||
void CacheNewDynamicZone(ServerPacket* pack);
|
||||
DynamicZone* CreateNew(DynamicZone& dz_request, const std::vector<DynamicZoneMember>& members);
|
||||
void Process();
|
||||
void PurgeExpiredDynamicZones();
|
||||
|
||||
std::unordered_map<uint32_t, std::unique_ptr<DynamicZone>> dynamic_zone_cache;
|
||||
|
||||
private:
|
||||
Timer m_process_throttle_timer{};
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -1,237 +0,0 @@
|
||||
/**
|
||||
* EQEmulator: Everquest Server Emulator
|
||||
* Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; version 2 of the License.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY except by those people which sell it, which
|
||||
* are required to give you total support for your newly bought product;
|
||||
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR
|
||||
* A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
*/
|
||||
|
||||
#include "expedition.h"
|
||||
#include "expedition_database.h"
|
||||
#include "cliententry.h"
|
||||
#include "clientlist.h"
|
||||
#include "zonelist.h"
|
||||
#include "zoneserver.h"
|
||||
#include "../common/eqemu_logsys.h"
|
||||
#include "../common/rulesys.h"
|
||||
|
||||
extern ClientList client_list;
|
||||
extern ZSList zoneserver_list;
|
||||
|
||||
Expedition::Expedition() :
|
||||
m_choose_leader_cooldown_timer{ static_cast<uint32_t>(RuleI(Expedition, ChooseLeaderCooldownTime)) }
|
||||
{
|
||||
m_warning_cooldown_timer.Enable();
|
||||
}
|
||||
|
||||
void Expedition::SetDynamicZone(DynamicZone&& dz)
|
||||
{
|
||||
dz.SetName(GetName());
|
||||
dz.SetLeader(GetLeader());
|
||||
|
||||
m_dynamic_zone = std::move(dz);
|
||||
}
|
||||
|
||||
void Expedition::RemoveMember(uint32_t character_id)
|
||||
{
|
||||
GetDynamicZone().RemoveInternalMember(character_id);
|
||||
|
||||
if (character_id == m_leader.id)
|
||||
{
|
||||
ChooseNewLeader();
|
||||
}
|
||||
}
|
||||
|
||||
void Expedition::ChooseNewLeader()
|
||||
{
|
||||
const auto& members = GetDynamicZone().GetMembers();
|
||||
if (members.empty() || !m_choose_leader_cooldown_timer.Check())
|
||||
{
|
||||
m_choose_leader_needed = true;
|
||||
return;
|
||||
}
|
||||
|
||||
auto it = std::find_if(members.begin(), members.end(), [&](const DynamicZoneMember& member) {
|
||||
if (member.id != m_leader.id && member.IsOnline()) {
|
||||
auto member_cle = client_list.FindCLEByCharacterID(member.id);
|
||||
return (member_cle && member_cle->GetOnline() == CLE_Status::InZone);
|
||||
}
|
||||
return false;
|
||||
});
|
||||
|
||||
if (it == members.end())
|
||||
{
|
||||
// no online members found, fallback to choosing any member
|
||||
it = std::find_if(members.begin(), members.end(),
|
||||
[&](const DynamicZoneMember& member) { return (member.id != m_leader.id); });
|
||||
}
|
||||
|
||||
if (it != members.end() && SetNewLeader(*it))
|
||||
{
|
||||
m_choose_leader_needed = false;
|
||||
}
|
||||
}
|
||||
|
||||
bool Expedition::SetNewLeader(const DynamicZoneMember& member)
|
||||
{
|
||||
if (!GetDynamicZone().HasMember(member.id))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
LogExpeditionsModerate("Replacing [{}] leader [{}] with [{}]", m_id, m_leader.name, member.name);
|
||||
ExpeditionDatabase::UpdateLeaderID(m_id, member.id);
|
||||
m_leader = member;
|
||||
m_dynamic_zone.SetLeader(m_leader);
|
||||
SendZonesLeaderChanged();
|
||||
return true;
|
||||
}
|
||||
|
||||
void Expedition::SendZonesExpeditionDeleted()
|
||||
{
|
||||
uint32_t pack_size = sizeof(ServerExpeditionID_Struct);
|
||||
auto pack = std::make_unique<ServerPacket>(ServerOP_ExpeditionDeleted, pack_size);
|
||||
auto buf = reinterpret_cast<ServerExpeditionID_Struct*>(pack->pBuffer);
|
||||
buf->expedition_id = GetID();
|
||||
zoneserver_list.SendPacket(pack.get());
|
||||
}
|
||||
|
||||
void Expedition::SendZonesExpireWarning(uint32_t minutes_remaining)
|
||||
{
|
||||
uint32_t pack_size = sizeof(ServerExpeditionExpireWarning_Struct);
|
||||
auto pack = std::make_unique<ServerPacket>(ServerOP_ExpeditionExpireWarning, pack_size);
|
||||
auto buf = reinterpret_cast<ServerExpeditionExpireWarning_Struct*>(pack->pBuffer);
|
||||
buf->expedition_id = GetID();
|
||||
buf->minutes_remaining = minutes_remaining;
|
||||
zoneserver_list.SendPacket(pack.get());
|
||||
}
|
||||
|
||||
void Expedition::SendZonesLeaderChanged()
|
||||
{
|
||||
uint32_t pack_size = sizeof(ServerExpeditionLeaderID_Struct);
|
||||
auto pack = std::make_unique<ServerPacket>(ServerOP_ExpeditionLeaderChanged, pack_size);
|
||||
auto buf = reinterpret_cast<ServerExpeditionLeaderID_Struct*>(pack->pBuffer);
|
||||
buf->expedition_id = GetID();
|
||||
buf->leader_id = m_leader.id;
|
||||
zoneserver_list.SendPacket(pack.get());
|
||||
}
|
||||
|
||||
void Expedition::CheckExpireWarning()
|
||||
{
|
||||
if (m_warning_cooldown_timer.Check(false))
|
||||
{
|
||||
using namespace std::chrono_literals;
|
||||
auto remaining = GetDynamicZone().GetDurationRemaining();
|
||||
if ((remaining > 14min && remaining < 15min) ||
|
||||
(remaining > 4min && remaining < 5min) ||
|
||||
(remaining > 0min && remaining < 1min))
|
||||
{
|
||||
int minutes = std::chrono::duration_cast<std::chrono::minutes>(remaining).count() + 1;
|
||||
SendZonesExpireWarning(minutes);
|
||||
m_warning_cooldown_timer.Start(70000); // 1 minute 10 seconds
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Expedition::CheckLeader()
|
||||
{
|
||||
if (m_choose_leader_needed)
|
||||
{
|
||||
ChooseNewLeader();
|
||||
}
|
||||
}
|
||||
|
||||
bool Expedition::Process()
|
||||
{
|
||||
// returns true if expedition needs to be deleted from world cache and db
|
||||
// expedition is not deleted until its dz has no clients to prevent exploits
|
||||
auto status = m_dynamic_zone.Process();
|
||||
if (status == DynamicZoneStatus::ExpiredEmpty)
|
||||
{
|
||||
LogExpeditions("Expedition [{}] expired or empty, notifying zones and deleting", GetID());
|
||||
SendZonesExpeditionDeleted();
|
||||
return true;
|
||||
}
|
||||
|
||||
CheckExpireWarning();
|
||||
CheckLeader();
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
void Expedition::UpdateMemberStatus(uint32_t character_id, DynamicZoneMemberStatus status)
|
||||
{
|
||||
GetDynamicZone().SetInternalMemberStatus(character_id, status);
|
||||
|
||||
// temporary until move to using dz leader object completely
|
||||
if (character_id == m_leader.id)
|
||||
{
|
||||
m_leader.status = GetDynamicZone().GetLeader().status;
|
||||
}
|
||||
|
||||
// any member status update will trigger a leader fix if leader was offline
|
||||
if (m_leader.status == DynamicZoneMemberStatus::Offline && GetDynamicZone().GetMemberCount() > 1)
|
||||
{
|
||||
ChooseNewLeader();
|
||||
}
|
||||
}
|
||||
|
||||
void Expedition::SendZoneMemberStatuses(uint16_t zone_id, uint16_t instance_id)
|
||||
{
|
||||
const auto& members = GetDynamicZone().GetMembers();
|
||||
|
||||
uint32_t members_count = static_cast<uint32_t>(members.size());
|
||||
uint32_t entries_size = sizeof(ServerExpeditionMemberStatusEntry_Struct) * members_count;
|
||||
uint32_t pack_size = sizeof(ServerExpeditionMemberStatuses_Struct) + entries_size;
|
||||
auto pack = std::make_unique<ServerPacket>(ServerOP_ExpeditionGetMemberStatuses, pack_size);
|
||||
auto buf = reinterpret_cast<ServerExpeditionMemberStatuses_Struct*>(pack->pBuffer);
|
||||
buf->expedition_id = GetID();
|
||||
buf->count = members_count;
|
||||
|
||||
for (int i = 0; i < members.size(); ++i)
|
||||
{
|
||||
buf->entries[i].character_id = members[i].id;
|
||||
buf->entries[i].online_status = static_cast<uint8_t>(members[i].status);
|
||||
}
|
||||
|
||||
zoneserver_list.SendPacket(zone_id, instance_id, pack.get());
|
||||
}
|
||||
|
||||
void Expedition::CacheMemberStatuses()
|
||||
{
|
||||
// called when a new expedition is cached to fill member statuses
|
||||
std::string zone_name{};
|
||||
std::vector<ClientListEntry*> all_clients;
|
||||
all_clients.reserve(client_list.GetClientCount());
|
||||
client_list.GetClients(zone_name.c_str(), all_clients);
|
||||
|
||||
for (const auto& member : GetDynamicZone().GetMembers())
|
||||
{
|
||||
auto it = std::find_if(all_clients.begin(), all_clients.end(),
|
||||
[&](const ClientListEntry* cle) { return (cle && cle->CharID() == member.id); });
|
||||
|
||||
auto status = DynamicZoneMemberStatus::Offline;
|
||||
if (it != all_clients.end())
|
||||
{
|
||||
status = DynamicZoneMemberStatus::Online;
|
||||
if (GetDynamicZone().IsSameDz((*it)->zone(), (*it)->instance()))
|
||||
{
|
||||
status = DynamicZoneMemberStatus::InDynamicZone;
|
||||
}
|
||||
}
|
||||
|
||||
GetDynamicZone().SetInternalMemberStatus(member.id, status);
|
||||
}
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
/**
|
||||
* EQEmulator: Everquest Server Emulator
|
||||
* Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; version 2 of the License.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY except by those people which sell it, which
|
||||
* are required to give you total support for your newly bought product;
|
||||
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR
|
||||
* A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef WORLD_EXPEDITION_H
|
||||
#define WORLD_EXPEDITION_H
|
||||
|
||||
#include "dynamic_zone.h"
|
||||
#include "../common/expedition_base.h"
|
||||
#include "../common/timer.h"
|
||||
#include <cstdint>
|
||||
|
||||
class Expedition : public ExpeditionBase
|
||||
{
|
||||
public:
|
||||
Expedition();
|
||||
|
||||
void RemoveMember(uint32_t character_id);
|
||||
void CacheMemberStatuses();
|
||||
void CheckExpireWarning();
|
||||
void CheckLeader();
|
||||
void ChooseNewLeader();
|
||||
DynamicZone& GetDynamicZone() { return m_dynamic_zone; }
|
||||
bool Process();
|
||||
void SendZoneMemberStatuses(uint16_t zone_id, uint16_t instance_id);
|
||||
void SendZonesExpeditionDeleted();
|
||||
void SendZonesExpireWarning(uint32_t minutes_remaining);
|
||||
void SetDynamicZone(DynamicZone&& dz);
|
||||
bool SetNewLeader(const DynamicZoneMember& member);
|
||||
void UpdateMemberStatus(uint32_t character_id, DynamicZoneMemberStatus status);
|
||||
|
||||
private:
|
||||
void SendZonesLeaderChanged();
|
||||
|
||||
bool m_choose_leader_needed = false;
|
||||
Timer m_choose_leader_cooldown_timer;
|
||||
Timer m_warning_cooldown_timer;
|
||||
DynamicZone m_dynamic_zone;
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -19,8 +19,9 @@
|
||||
*/
|
||||
|
||||
#include "expedition_database.h"
|
||||
#include "expedition.h"
|
||||
#include "worlddb.h"
|
||||
#include "../common/repositories/expeditions_repository.h"
|
||||
#include "../common/repositories/expedition_lockouts_repository.h"
|
||||
#include "../common/repositories/dynamic_zone_members_repository.h"
|
||||
|
||||
void ExpeditionDatabase::PurgeExpiredExpeditions()
|
||||
@@ -34,7 +35,7 @@ void ExpeditionDatabase::PurgeExpiredExpeditions()
|
||||
LEFT JOIN instance_list ON dynamic_zones.instance_id = instance_list.id
|
||||
LEFT JOIN
|
||||
(
|
||||
SELECT dynamic_zone_id, COUNT(IF(is_current_member = TRUE, 1, NULL)) member_count
|
||||
SELECT dynamic_zone_id, COUNT(*) member_count
|
||||
FROM dynamic_zone_members
|
||||
GROUP BY dynamic_zone_id
|
||||
) dynamic_zone_members
|
||||
@@ -59,8 +60,9 @@ void ExpeditionDatabase::PurgeExpiredExpeditions()
|
||||
|
||||
if (!expedition_ids.empty())
|
||||
{
|
||||
ExpeditionDatabase::MoveMembersToSafeReturn(expedition_ids);
|
||||
ExpeditionDatabase::DeleteExpeditions(expedition_ids);
|
||||
auto joined_expedition_ids = fmt::join(expedition_ids, ",");
|
||||
ExpeditionsRepository::DeleteWhere(database, fmt::format("id IN ({})", joined_expedition_ids));
|
||||
ExpeditionLockoutsRepository::DeleteWhere(database, fmt::format("expedition_id IN ({})", joined_expedition_ids));
|
||||
DynamicZoneMembersRepository::RemoveAllMembers(database, dynamic_zone_ids);
|
||||
}
|
||||
}
|
||||
@@ -75,56 +77,3 @@ void ExpeditionDatabase::PurgeExpiredCharacterLockouts()
|
||||
|
||||
database.QueryDatabase(query);
|
||||
}
|
||||
|
||||
void ExpeditionDatabase::DeleteExpeditions(const std::vector<uint32_t>& expedition_ids)
|
||||
{
|
||||
LogExpeditionsDetail("Deleting [{}] expedition(s)", expedition_ids.size());
|
||||
|
||||
std::string expedition_ids_query = fmt::format("{}", fmt::join(expedition_ids, ","));
|
||||
|
||||
if (!expedition_ids_query.empty())
|
||||
{
|
||||
auto query = fmt::format("DELETE FROM expeditions WHERE id IN ({});", expedition_ids_query);
|
||||
database.QueryDatabase(query);
|
||||
|
||||
query = fmt::format("DELETE FROM expedition_lockouts WHERE expedition_id IN ({});", expedition_ids_query);
|
||||
database.QueryDatabase(query);
|
||||
}
|
||||
}
|
||||
|
||||
void ExpeditionDatabase::UpdateLeaderID(uint32_t expedition_id, uint32_t leader_id)
|
||||
{
|
||||
LogExpeditionsDetail("Updating leader [{}] for expedition [{}]", leader_id, expedition_id);
|
||||
|
||||
auto query = fmt::format(SQL(
|
||||
UPDATE expeditions SET leader_id = {} WHERE id = {};
|
||||
), leader_id, expedition_id);
|
||||
|
||||
database.QueryDatabase(query);
|
||||
}
|
||||
|
||||
void ExpeditionDatabase::MoveMembersToSafeReturn(const std::vector<uint32_t>& expedition_ids)
|
||||
{
|
||||
LogExpeditionsDetail("Moving members from [{}] expedition(s) to safereturn", expedition_ids.size());
|
||||
|
||||
// only offline members still in expired dz zones should be updated here
|
||||
std::string query = fmt::format(SQL(
|
||||
UPDATE character_data
|
||||
INNER JOIN dynamic_zone_members ON character_data.id = dynamic_zone_members.character_id
|
||||
INNER JOIN expeditions ON dynamic_zone_members.dynamic_zone_id = expeditions.dynamic_zone_id
|
||||
INNER JOIN dynamic_zones ON expeditions.dynamic_zone_id = dynamic_zones.id
|
||||
INNER JOIN instance_list ON dynamic_zones.instance_id = instance_list.id
|
||||
AND character_data.zone_instance = instance_list.id
|
||||
AND character_data.zone_id = instance_list.zone
|
||||
SET
|
||||
zone_id = IF(safe_return_zone_id > 0, safe_return_zone_id, zone_id),
|
||||
zone_instance = IF(safe_return_zone_id > 0, 0, zone_instance),
|
||||
x = IF(safe_return_zone_id > 0, safe_return_x, x),
|
||||
y = IF(safe_return_zone_id > 0, safe_return_y, y),
|
||||
z = IF(safe_return_zone_id > 0, safe_return_z, z),
|
||||
heading = IF(safe_return_zone_id > 0, safe_return_heading, heading)
|
||||
WHERE expeditions.id IN ({});
|
||||
), fmt::join(expedition_ids, ","));
|
||||
|
||||
database.QueryDatabase(query);
|
||||
}
|
||||
|
||||
@@ -28,11 +28,8 @@ class Expedition;
|
||||
|
||||
namespace ExpeditionDatabase
|
||||
{
|
||||
void DeleteExpeditions(const std::vector<uint32_t>& expedition_ids);
|
||||
void MoveMembersToSafeReturn(const std::vector<uint32_t>& expedition_ids);
|
||||
void PurgeExpiredExpeditions();
|
||||
void PurgeExpiredCharacterLockouts();
|
||||
void UpdateLeaderID(uint32_t expedition_id, uint32_t leader_id);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -18,9 +18,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "expedition.h"
|
||||
#include "dynamic_zone.h"
|
||||
#include "expedition_message.h"
|
||||
#include "expedition_state.h"
|
||||
#include "cliententry.h"
|
||||
#include "clientlist.h"
|
||||
#include "zonelist.h"
|
||||
@@ -37,50 +36,9 @@ void ExpeditionMessage::HandleZoneMessage(ServerPacket* pack)
|
||||
{
|
||||
case ServerOP_ExpeditionCreate:
|
||||
{
|
||||
auto buf = reinterpret_cast<ServerExpeditionID_Struct*>(pack->pBuffer);
|
||||
expedition_state.CacheFromDatabase(buf->expedition_id);
|
||||
zoneserver_list.SendPacket(pack);
|
||||
break;
|
||||
}
|
||||
case ServerOP_ExpeditionMemberChange:
|
||||
{
|
||||
auto buf = reinterpret_cast<ServerExpeditionMemberChange_Struct*>(pack->pBuffer);
|
||||
expedition_state.MemberChange(buf->expedition_id, { buf->char_id, buf->char_name }, buf->removed);
|
||||
zoneserver_list.SendPacket(pack);
|
||||
break;
|
||||
}
|
||||
case ServerOP_ExpeditionMemberSwap:
|
||||
{
|
||||
auto buf = reinterpret_cast<ServerExpeditionMemberSwap_Struct*>(pack->pBuffer);
|
||||
expedition_state.MemberChange(buf->expedition_id, { buf->add_char_id, buf->add_char_name }, false);
|
||||
expedition_state.MemberChange(buf->expedition_id, { buf->remove_char_id, buf->remove_char_name }, true);
|
||||
zoneserver_list.SendPacket(pack);
|
||||
break;
|
||||
}
|
||||
case ServerOP_ExpeditionMembersRemoved:
|
||||
{
|
||||
auto buf = reinterpret_cast<ServerExpeditionID_Struct*>(pack->pBuffer);
|
||||
expedition_state.RemoveAllMembers(buf->expedition_id);
|
||||
zoneserver_list.SendPacket(pack);
|
||||
break;
|
||||
}
|
||||
case ServerOP_ExpeditionMemberStatus:
|
||||
{
|
||||
auto buf = reinterpret_cast<ServerExpeditionMemberStatus_Struct*>(pack->pBuffer);
|
||||
auto expedition = expedition_state.GetExpedition(buf->expedition_id);
|
||||
if (expedition)
|
||||
{
|
||||
auto status = static_cast<DynamicZoneMemberStatus>(buf->status);
|
||||
expedition->UpdateMemberStatus(buf->character_id, status);
|
||||
}
|
||||
zoneserver_list.SendPacket(pack);
|
||||
break;
|
||||
}
|
||||
case ServerOP_ExpeditionGetMemberStatuses:
|
||||
{
|
||||
ExpeditionMessage::GetMemberStatuses(pack);
|
||||
break;
|
||||
}
|
||||
case ServerOP_ExpeditionDzAddPlayer:
|
||||
{
|
||||
ExpeditionMessage::AddPlayer(pack);
|
||||
@@ -145,10 +103,10 @@ void ExpeditionMessage::MakeLeader(ServerPacket* pack)
|
||||
ClientListEntry* new_leader_cle = client_list.FindCharacter(buf->new_leader_name);
|
||||
if (new_leader_cle && new_leader_cle->Server())
|
||||
{
|
||||
auto expedition = expedition_state.GetExpedition(buf->expedition_id);
|
||||
if (expedition)
|
||||
auto dz = DynamicZone::FindDynamicZoneByID(buf->dz_id);
|
||||
if (dz && dz->GetLeaderID() == buf->requester_id)
|
||||
{
|
||||
buf->is_success = expedition->SetNewLeader({ new_leader_cle->CharID(), new_leader_cle->name() });
|
||||
buf->is_success = dz->SetNewLeader(new_leader_cle->CharID());
|
||||
}
|
||||
|
||||
buf->is_online = true;
|
||||
@@ -164,16 +122,6 @@ void ExpeditionMessage::MakeLeader(ServerPacket* pack)
|
||||
}
|
||||
}
|
||||
|
||||
void ExpeditionMessage::GetMemberStatuses(ServerPacket* pack)
|
||||
{
|
||||
auto buf = reinterpret_cast<ServerExpeditionID_Struct*>(pack->pBuffer);
|
||||
auto expedition = expedition_state.GetExpedition(buf->expedition_id);
|
||||
if (expedition)
|
||||
{
|
||||
expedition->SendZoneMemberStatuses(buf->sender_zone_id, buf->sender_instance_id);
|
||||
}
|
||||
}
|
||||
|
||||
void ExpeditionMessage::SaveInvite(ServerPacket* pack)
|
||||
{
|
||||
auto buf = reinterpret_cast<ServerDzCommand_Struct*>(pack->pBuffer);
|
||||
|
||||
@@ -26,7 +26,6 @@ class ServerPacket;
|
||||
namespace ExpeditionMessage
|
||||
{
|
||||
void AddPlayer(ServerPacket* pack);
|
||||
void GetMemberStatuses(ServerPacket* pack);
|
||||
void HandleZoneMessage(ServerPacket* pack);
|
||||
void MakeLeader(ServerPacket* pack);
|
||||
void RequestInvite(ServerPacket* pack);
|
||||
|
||||
@@ -1,172 +0,0 @@
|
||||
/**
|
||||
* EQEmulator: Everquest Server Emulator
|
||||
* Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; version 2 of the License.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY except by those people which sell it, which
|
||||
* are required to give you total support for your newly bought product;
|
||||
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR
|
||||
* A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
*/
|
||||
|
||||
#include "expedition_state.h"
|
||||
#include "expedition.h"
|
||||
#include "expedition_database.h"
|
||||
#include "worlddb.h"
|
||||
#include "../common/dynamic_zone_base.h"
|
||||
#include "../common/eqemu_logsys.h"
|
||||
#include "../common/repositories/dynamic_zone_members_repository.h"
|
||||
#include <algorithm>
|
||||
|
||||
ExpeditionState expedition_state;
|
||||
|
||||
Expedition* ExpeditionState::GetExpedition(uint32_t expedition_id)
|
||||
{
|
||||
auto it = std::find_if(m_expeditions.begin(), m_expeditions.end(),
|
||||
[&](const std::unique_ptr<Expedition>& expedition) {
|
||||
return expedition->GetID() == expedition_id;
|
||||
});
|
||||
|
||||
return (it != m_expeditions.end()) ? it->get() : nullptr;
|
||||
}
|
||||
|
||||
Expedition* ExpeditionState::GetExpeditionByDynamicZoneID(uint32_t dz_id)
|
||||
{
|
||||
auto it = std::find_if(m_expeditions.begin(), m_expeditions.end(),
|
||||
[&](const std::unique_ptr<Expedition>& expedition) {
|
||||
return expedition->GetDynamicZone().GetID() == dz_id;
|
||||
});
|
||||
|
||||
return (it != m_expeditions.end()) ? it->get() : nullptr;
|
||||
}
|
||||
|
||||
void ExpeditionState::CacheFromDatabase(uint32_t expedition_id)
|
||||
{
|
||||
if (expedition_id == 0 || GetExpedition(expedition_id))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
auto expedition = ExpeditionsRepository::GetWithLeaderName(database, expedition_id);
|
||||
CacheExpeditions({ std::move(expedition) });
|
||||
}
|
||||
|
||||
void ExpeditionState::CacheAllFromDatabase()
|
||||
{
|
||||
BenchTimer benchmark;
|
||||
|
||||
auto expeditions = ExpeditionsRepository::GetAllWithLeaderName(database);
|
||||
m_expeditions.clear();
|
||||
m_expeditions.reserve(expeditions.size());
|
||||
|
||||
CacheExpeditions(std::move(expeditions));
|
||||
|
||||
LogExpeditions("Caching [{}] expedition(s) took [{}s]", m_expeditions.size(), benchmark.elapsed());
|
||||
}
|
||||
|
||||
void ExpeditionState::CacheExpeditions(
|
||||
std::vector<ExpeditionsRepository::ExpeditionWithLeader>&& expedition_entries)
|
||||
{
|
||||
// bulk load expedition dzs and members before caching
|
||||
std::vector<uint32_t> dynamic_zone_ids;
|
||||
for (const auto& entry : expedition_entries)
|
||||
{
|
||||
dynamic_zone_ids.emplace_back(entry.dynamic_zone_id);
|
||||
}
|
||||
|
||||
auto dynamic_zones = DynamicZonesRepository::GetWithInstance(database, dynamic_zone_ids);
|
||||
auto dynamic_zone_members = DynamicZoneMembersRepository::GetWithNames(database, dynamic_zone_ids);
|
||||
|
||||
for (auto& entry : expedition_entries)
|
||||
{
|
||||
auto expedition = std::make_unique<Expedition>();
|
||||
expedition->LoadRepositoryResult(std::move(entry));
|
||||
|
||||
auto dz_entry_iter = std::find_if(dynamic_zones.begin(), dynamic_zones.end(),
|
||||
[&](const DynamicZonesRepository::DynamicZoneInstance& dz_entry) {
|
||||
return dz_entry.id == entry.dynamic_zone_id;
|
||||
});
|
||||
|
||||
if (dz_entry_iter != dynamic_zones.end())
|
||||
{
|
||||
expedition->SetDynamicZone(std::move(*dz_entry_iter));
|
||||
}
|
||||
|
||||
for (auto& member : dynamic_zone_members)
|
||||
{
|
||||
if (member.dynamic_zone_id == entry.dynamic_zone_id)
|
||||
{
|
||||
expedition->GetDynamicZone().AddMemberFromRepositoryResult(std::move(member));
|
||||
}
|
||||
}
|
||||
|
||||
// stored on expedition in db but on dz in memory cache
|
||||
expedition->GetDynamicZone().SetMinPlayers(entry.min_players);
|
||||
expedition->GetDynamicZone().SetMaxPlayers(entry.max_players);
|
||||
|
||||
expedition->CacheMemberStatuses();
|
||||
|
||||
m_expeditions.emplace_back(std::move(expedition));
|
||||
}
|
||||
}
|
||||
|
||||
void ExpeditionState::MemberChange(
|
||||
uint32_t expedition_id, const DynamicZoneMember& member, bool remove)
|
||||
{
|
||||
auto expedition = GetExpedition(expedition_id);
|
||||
if (expedition)
|
||||
{
|
||||
if (remove) {
|
||||
expedition->RemoveMember(member.id);
|
||||
} else {
|
||||
expedition->GetDynamicZone().AddInternalMember(member);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ExpeditionState::RemoveAllMembers(uint32_t expedition_id)
|
||||
{
|
||||
auto expedition = GetExpedition(expedition_id);
|
||||
if (expedition)
|
||||
{
|
||||
expedition->GetDynamicZone().ClearInternalMembers();
|
||||
}
|
||||
}
|
||||
|
||||
void ExpeditionState::Process()
|
||||
{
|
||||
if (!m_process_throttle_timer.Check())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
std::vector<uint32_t> expedition_ids;
|
||||
std::vector<uint32_t> dynamic_zone_ids;
|
||||
|
||||
for (auto it = m_expeditions.begin(); it != m_expeditions.end();)
|
||||
{
|
||||
bool is_deleted = (*it)->Process();
|
||||
if (is_deleted)
|
||||
{
|
||||
expedition_ids.emplace_back((*it)->GetID());
|
||||
dynamic_zone_ids.emplace_back((*it)->GetDynamicZone().GetID());
|
||||
}
|
||||
it = is_deleted ? m_expeditions.erase(it) : it + 1;
|
||||
}
|
||||
|
||||
if (!expedition_ids.empty())
|
||||
{
|
||||
ExpeditionDatabase::MoveMembersToSafeReturn(expedition_ids);
|
||||
ExpeditionDatabase::DeleteExpeditions(expedition_ids);
|
||||
DynamicZoneMembersRepository::RemoveAllMembers(database, dynamic_zone_ids);
|
||||
}
|
||||
}
|
||||
@@ -1,52 +0,0 @@
|
||||
/**
|
||||
* EQEmulator: Everquest Server Emulator
|
||||
* Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; version 2 of the License.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY except by those people which sell it, which
|
||||
* are required to give you total support for your newly bought product;
|
||||
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR
|
||||
* A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef WORLD_EXPEDITION_STATE_H
|
||||
#define WORLD_EXPEDITION_STATE_H
|
||||
|
||||
#include "../common/repositories/expeditions_repository.h"
|
||||
#include "../common/rulesys.h"
|
||||
#include "../common/timer.h"
|
||||
#include <cstdint>
|
||||
#include <vector>
|
||||
|
||||
extern class ExpeditionState expedition_state;
|
||||
|
||||
class Expedition;
|
||||
struct DynamicZoneMember;
|
||||
|
||||
class ExpeditionState
|
||||
{
|
||||
public:
|
||||
void CacheExpeditions(std::vector<ExpeditionsRepository::ExpeditionWithLeader>&& expedition_entries);
|
||||
void CacheFromDatabase(uint32_t expedition_id);
|
||||
void CacheAllFromDatabase();
|
||||
Expedition* GetExpedition(uint32_t expedition_id);
|
||||
Expedition* GetExpeditionByDynamicZoneID(uint32_t dz_id);
|
||||
void MemberChange(uint32_t expedition_id, const DynamicZoneMember& member, bool remove);
|
||||
void Process();
|
||||
void RemoveAllMembers(uint32_t expedition_id);
|
||||
|
||||
private:
|
||||
std::vector<std::unique_ptr<Expedition>> m_expeditions;
|
||||
Timer m_process_throttle_timer{static_cast<uint32_t>(RuleI(DynamicZone, WorldProcessRate))};
|
||||
};
|
||||
|
||||
#endif
|
||||
+150
-94
@@ -46,6 +46,7 @@
|
||||
#include "../common/crash.h"
|
||||
#include "client.h"
|
||||
#include "worlddb.h"
|
||||
|
||||
#ifdef _WINDOWS
|
||||
#include <process.h>
|
||||
#define snprintf _snprintf
|
||||
@@ -53,12 +54,14 @@
|
||||
#define strcasecmp _stricmp
|
||||
#include <conio.h>
|
||||
#else
|
||||
|
||||
#include <pthread.h>
|
||||
#include "../common/unix.h"
|
||||
#include <sys/types.h>
|
||||
#include <sys/ipc.h>
|
||||
#include <sys/sem.h>
|
||||
#include <sys/shm.h>
|
||||
|
||||
#if not defined (FREEBSD) && not defined (DARWIN)
|
||||
union semun {
|
||||
int val;
|
||||
@@ -88,41 +91,45 @@ union semun {
|
||||
#include "queryserv.h"
|
||||
#include "web_interface.h"
|
||||
#include "console.h"
|
||||
#include "dynamic_zone_manager.h"
|
||||
#include "expedition_database.h"
|
||||
#include "expedition_state.h"
|
||||
|
||||
#include "../common/net/servertalk_server.h"
|
||||
#include "../zone/data_bucket.h"
|
||||
#include "world_server_command_handler.h"
|
||||
#include "../common/content/world_content_service.h"
|
||||
#include "../common/repositories/character_task_timers_repository.h"
|
||||
#include "../common/repositories/merchantlist_temp_repository.h"
|
||||
#include "world_store.h"
|
||||
#include "world_event_scheduler.h"
|
||||
#include "shared_task_manager.h"
|
||||
|
||||
WorldStore world_store;
|
||||
ClientList client_list;
|
||||
GroupLFPList LFPGroupList;
|
||||
ZSList zoneserver_list;
|
||||
LoginServerList loginserverlist;
|
||||
UCSConnection UCSLink;
|
||||
WorldStore world_store;
|
||||
ClientList client_list;
|
||||
GroupLFPList LFPGroupList;
|
||||
ZSList zoneserver_list;
|
||||
LoginServerList loginserverlist;
|
||||
UCSConnection UCSLink;
|
||||
QueryServConnection QSLink;
|
||||
LauncherList launcher_list;
|
||||
AdventureManager adventure_manager;
|
||||
LauncherList launcher_list;
|
||||
AdventureManager adventure_manager;
|
||||
WorldEventScheduler event_scheduler;
|
||||
EQ::Random emu_random;
|
||||
volatile bool RunLoops = true;
|
||||
uint32 numclients = 0;
|
||||
uint32 numzones = 0;
|
||||
bool holdzones = false;
|
||||
const WorldConfig *Config;
|
||||
EQEmuLogSys LogSys;
|
||||
SharedTaskManager shared_task_manager;
|
||||
EQ::Random emu_random;
|
||||
volatile bool RunLoops = true;
|
||||
uint32 numclients = 0;
|
||||
uint32 numzones = 0;
|
||||
bool holdzones = false;
|
||||
const WorldConfig *Config;
|
||||
EQEmuLogSys LogSys;
|
||||
WorldContentService content_service;
|
||||
WebInterfaceList web_interface;
|
||||
WebInterfaceList web_interface;
|
||||
|
||||
void CatchSignal(int sig_num);
|
||||
void CheckForServerScript(bool force_download = false);
|
||||
|
||||
inline void UpdateWindowTitle(std::string new_title) {
|
||||
inline void UpdateWindowTitle(std::string new_title)
|
||||
{
|
||||
#ifdef _WINDOWS
|
||||
SetConsoleTitle(new_title.c_str());
|
||||
#endif
|
||||
@@ -154,7 +161,7 @@ void LoadDatabaseConnections()
|
||||
*/
|
||||
if (!Config->ContentDbHost.empty()) {
|
||||
if (!content_db.Connect(
|
||||
Config->ContentDbHost.c_str() ,
|
||||
Config->ContentDbHost.c_str(),
|
||||
Config->ContentDbUsername.c_str(),
|
||||
Config->ContentDbPassword.c_str(),
|
||||
Config->ContentDbName.c_str(),
|
||||
@@ -164,7 +171,8 @@ void LoadDatabaseConnections()
|
||||
LogError("Cannot continue without a content database connection");
|
||||
std::exit(1);
|
||||
}
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
content_db.SetMysql(database.getMySQL());
|
||||
}
|
||||
|
||||
@@ -174,7 +182,7 @@ void CheckForXMLConfigUpgrade()
|
||||
{
|
||||
if (!std::ifstream("eqemu_config.json") && std::ifstream("eqemu_config.xml")) {
|
||||
CheckForServerScript(true);
|
||||
if(system("perl eqemu_server.pl convert_xml"));
|
||||
if (system("perl eqemu_server.pl convert_xml")) {}
|
||||
}
|
||||
else {
|
||||
CheckForServerScript();
|
||||
@@ -205,7 +213,7 @@ void RegisterLoginservers()
|
||||
}
|
||||
}
|
||||
else {
|
||||
LinkedList<LoginConfig *> loginlist = Config->loginlist;
|
||||
LinkedList<LoginConfig *> loginlist = Config->loginlist;
|
||||
LinkedListIterator<LoginConfig *> iterator(loginlist);
|
||||
iterator.Reset();
|
||||
while (iterator.MoreElements()) {
|
||||
@@ -274,7 +282,8 @@ static void GMSayHookCallBackProcessWorld(uint16 log_category, std::string messa
|
||||
* @param argv
|
||||
* @return
|
||||
*/
|
||||
int main(int argc, char** argv) {
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
RegisterExecutablePlatform(ExePlatformWorld);
|
||||
LogSys.LoadLogSettingsDefaults();
|
||||
set_exception_handler();
|
||||
@@ -445,7 +454,7 @@ int main(int argc, char** argv) {
|
||||
|
||||
LogInfo("Loading EQ time of day");
|
||||
TimeOfDay_Struct eqTime;
|
||||
time_t realtime;
|
||||
time_t realtime;
|
||||
eqTime = database.LoadTime(realtime);
|
||||
zoneserver_list.worldclock.SetCurrentEQTimeOfDay(eqTime, realtime);
|
||||
Timer EQTimeTimer(600000);
|
||||
@@ -457,37 +466,50 @@ int main(int argc, char** argv) {
|
||||
LogInfo("Deleted [{}] stale player corpses from database", database.DeleteStalePlayerCorpses());
|
||||
|
||||
LogInfo("Loading adventures");
|
||||
if (!adventure_manager.LoadAdventureTemplates())
|
||||
{
|
||||
if (!adventure_manager.LoadAdventureTemplates()) {
|
||||
LogInfo("Unable to load adventure templates");
|
||||
}
|
||||
|
||||
if (!adventure_manager.LoadAdventureEntries())
|
||||
{
|
||||
if (!adventure_manager.LoadAdventureEntries()) {
|
||||
LogInfo("Unable to load adventure templates");
|
||||
}
|
||||
|
||||
adventure_manager.LoadLeaderboardInfo();
|
||||
|
||||
LogInfo("Purging expired dynamic zones and members");
|
||||
dynamic_zone_manager.PurgeExpiredDynamicZones();
|
||||
|
||||
LogInfo("Purging expired expeditions");
|
||||
ExpeditionDatabase::PurgeExpiredExpeditions();
|
||||
ExpeditionDatabase::PurgeExpiredCharacterLockouts();
|
||||
|
||||
LogInfo("Purging expired character task timers");
|
||||
CharacterTaskTimersRepository::DeleteWhere(database, "expire_time <= NOW()");
|
||||
|
||||
LogInfo("Purging expired instances");
|
||||
database.PurgeExpiredInstances();
|
||||
|
||||
Timer PurgeInstanceTimer(450000);
|
||||
PurgeInstanceTimer.Start(450000);
|
||||
|
||||
LogInfo("Loading active expeditions");
|
||||
expedition_state.CacheAllFromDatabase();
|
||||
LogInfo("Loading dynamic zones");
|
||||
dynamic_zone_manager.CacheAllFromDatabase();
|
||||
|
||||
LogInfo("Loading char create info");
|
||||
content_db.LoadCharacterCreateAllocations();
|
||||
content_db.LoadCharacterCreateCombos();
|
||||
|
||||
LogInfo("Initializing [EventScheduler]");
|
||||
event_scheduler.SetDatabase(&database)->LoadScheduledEvents();
|
||||
|
||||
LogInfo("Initializing [SharedTaskManager]");
|
||||
shared_task_manager.SetDatabase(&database)
|
||||
->SetContentDatabase(&content_db)
|
||||
->LoadTaskData()
|
||||
->LoadSharedTaskState();
|
||||
|
||||
shared_task_manager.PurgeExpiredSharedTasks();
|
||||
|
||||
std::unique_ptr<EQ::Net::ConsoleServer> console;
|
||||
if (Config->TelnetEnabled) {
|
||||
LogInfo("Console (TCP) listener started");
|
||||
@@ -500,8 +522,8 @@ int main(int argc, char** argv) {
|
||||
server_connection = std::make_unique<EQ::Net::ServertalkServer>();
|
||||
|
||||
EQ::Net::ServertalkServerOptions server_opts;
|
||||
server_opts.port = Config->WorldTCPPort;
|
||||
server_opts.ipv6 = false;
|
||||
server_opts.port = Config->WorldTCPPort;
|
||||
server_opts.ipv6 = false;
|
||||
server_opts.credentials = Config->SharedKey;
|
||||
server_connection->Listen(server_opts);
|
||||
LogInfo("Server (TCP) listener started");
|
||||
@@ -516,50 +538,62 @@ int main(int argc, char** argv) {
|
||||
}
|
||||
);
|
||||
|
||||
server_connection->OnConnectionRemoved("Zone", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
|
||||
LogInfo("Removed Zone Server connection from [{0}]",
|
||||
connection->GetUUID());
|
||||
server_connection->OnConnectionRemoved(
|
||||
"Zone", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
|
||||
LogInfo("Removed Zone Server connection from [{0}]",
|
||||
connection->GetUUID());
|
||||
|
||||
numzones--;
|
||||
zoneserver_list.Remove(connection->GetUUID());
|
||||
});
|
||||
numzones--;
|
||||
zoneserver_list.Remove(connection->GetUUID());
|
||||
}
|
||||
);
|
||||
|
||||
server_connection->OnConnectionIdentified("Launcher", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
|
||||
LogInfo("New Launcher connection from [{2}] at [{0}:{1}]",
|
||||
connection->Handle()->RemoteIP(), connection->Handle()->RemotePort(), connection->GetUUID());
|
||||
server_connection->OnConnectionIdentified(
|
||||
"Launcher", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
|
||||
LogInfo("New Launcher connection from [{2}] at [{0}:{1}]",
|
||||
connection->Handle()->RemoteIP(), connection->Handle()->RemotePort(), connection->GetUUID());
|
||||
|
||||
launcher_list.Add(connection);
|
||||
});
|
||||
launcher_list.Add(connection);
|
||||
}
|
||||
);
|
||||
|
||||
server_connection->OnConnectionRemoved("Launcher", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
|
||||
LogInfo("Removed Launcher connection from [{0}]",
|
||||
connection->GetUUID());
|
||||
server_connection->OnConnectionRemoved(
|
||||
"Launcher", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
|
||||
LogInfo("Removed Launcher connection from [{0}]",
|
||||
connection->GetUUID());
|
||||
|
||||
launcher_list.Remove(connection);
|
||||
});
|
||||
launcher_list.Remove(connection);
|
||||
}
|
||||
);
|
||||
|
||||
server_connection->OnConnectionIdentified("QueryServ", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
|
||||
LogInfo("New Query Server connection from [{2}] at [{0}:{1}]",
|
||||
connection->Handle()->RemoteIP(), connection->Handle()->RemotePort(), connection->GetUUID());
|
||||
server_connection->OnConnectionIdentified(
|
||||
"QueryServ", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
|
||||
LogInfo("New Query Server connection from [{2}] at [{0}:{1}]",
|
||||
connection->Handle()->RemoteIP(), connection->Handle()->RemotePort(), connection->GetUUID());
|
||||
|
||||
QSLink.AddConnection(connection);
|
||||
});
|
||||
QSLink.AddConnection(connection);
|
||||
}
|
||||
);
|
||||
|
||||
server_connection->OnConnectionRemoved("QueryServ", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
|
||||
LogInfo("Removed Query Server connection from [{0}]",
|
||||
connection->GetUUID());
|
||||
server_connection->OnConnectionRemoved(
|
||||
"QueryServ", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
|
||||
LogInfo("Removed Query Server connection from [{0}]",
|
||||
connection->GetUUID());
|
||||
|
||||
QSLink.RemoveConnection(connection);
|
||||
});
|
||||
QSLink.RemoveConnection(connection);
|
||||
}
|
||||
);
|
||||
|
||||
server_connection->OnConnectionIdentified("UCS", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
|
||||
LogInfo("New UCS Server connection from [{2}] at [{0}:{1}]",
|
||||
connection->Handle()->RemoteIP(), connection->Handle()->RemotePort(), connection->GetUUID());
|
||||
server_connection->OnConnectionIdentified(
|
||||
"UCS", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
|
||||
LogInfo("New UCS Server connection from [{2}] at [{0}:{1}]",
|
||||
connection->Handle()->RemoteIP(), connection->Handle()->RemotePort(), connection->GetUUID());
|
||||
|
||||
UCSLink.SetConnection(connection);
|
||||
UCSLink.SetConnection(connection);
|
||||
|
||||
zoneserver_list.UpdateUCSServerAvailable();
|
||||
});
|
||||
zoneserver_list.UpdateUCSServerAvailable();
|
||||
}
|
||||
);
|
||||
|
||||
server_connection->OnConnectionRemoved(
|
||||
"UCS", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
|
||||
@@ -575,26 +609,30 @@ int main(int argc, char** argv) {
|
||||
}
|
||||
);
|
||||
|
||||
server_connection->OnConnectionIdentified("WebInterface", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
|
||||
LogInfo("New WebInterface Server connection from [{2}] at [{0}:{1}]",
|
||||
connection->Handle()->RemoteIP(), connection->Handle()->RemotePort(), connection->GetUUID());
|
||||
server_connection->OnConnectionIdentified(
|
||||
"WebInterface", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
|
||||
LogInfo("New WebInterface Server connection from [{2}] at [{0}:{1}]",
|
||||
connection->Handle()->RemoteIP(), connection->Handle()->RemotePort(), connection->GetUUID());
|
||||
|
||||
web_interface.AddConnection(connection);
|
||||
});
|
||||
web_interface.AddConnection(connection);
|
||||
}
|
||||
);
|
||||
|
||||
server_connection->OnConnectionRemoved("WebInterface", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
|
||||
LogInfo("Removed WebInterface Server connection from [{0}]",
|
||||
connection->GetUUID());
|
||||
server_connection->OnConnectionRemoved(
|
||||
"WebInterface", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
|
||||
LogInfo("Removed WebInterface Server connection from [{0}]",
|
||||
connection->GetUUID());
|
||||
|
||||
web_interface.RemoveConnection(connection);
|
||||
});
|
||||
web_interface.RemoveConnection(connection);
|
||||
}
|
||||
);
|
||||
|
||||
EQStreamManagerInterfaceOptions opts(9000, false, false);
|
||||
opts.daybreak_options.resend_delay_ms = RuleI(Network, ResendDelayBaseMS);
|
||||
opts.daybreak_options.resend_delay_ms = RuleI(Network, ResendDelayBaseMS);
|
||||
opts.daybreak_options.resend_delay_factor = RuleR(Network, ResendDelayFactor);
|
||||
opts.daybreak_options.resend_delay_min = RuleI(Network, ResendDelayMinMS);
|
||||
opts.daybreak_options.resend_delay_max = RuleI(Network, ResendDelayMaxMS);
|
||||
opts.daybreak_options.outgoing_data_rate = RuleR(Network, ClientDataRate);
|
||||
opts.daybreak_options.resend_delay_min = RuleI(Network, ResendDelayMinMS);
|
||||
opts.daybreak_options.resend_delay_max = RuleI(Network, ResendDelayMaxMS);
|
||||
opts.daybreak_options.outgoing_data_rate = RuleR(Network, ClientDataRate);
|
||||
|
||||
EQ::Net::EQStreamManager eqsm(opts);
|
||||
|
||||
@@ -607,14 +645,16 @@ int main(int argc, char** argv) {
|
||||
zoneserver_list.reminder->Disable();
|
||||
Timer InterserverTimer(INTERSERVER_TIMER); // does MySQL pings and auto-reconnect
|
||||
InterserverTimer.Trigger();
|
||||
uint8 ReconnectCounter = 100;
|
||||
uint8 ReconnectCounter = 100;
|
||||
std::shared_ptr<EQStreamInterface> eqs;
|
||||
EQStreamInterface *eqsi;
|
||||
EQStreamInterface *eqsi;
|
||||
|
||||
eqsm.OnNewConnection([&stream_identifier](std::shared_ptr<EQ::Net::EQStream> stream) {
|
||||
stream_identifier.AddStream(stream);
|
||||
LogInfo("New connection from IP {0}:{1}", stream->GetRemoteIP(), ntohs(stream->GetRemotePort()));
|
||||
});
|
||||
eqsm.OnNewConnection(
|
||||
[&stream_identifier](std::shared_ptr<EQ::Net::EQStream> stream) {
|
||||
stream_identifier.AddStream(stream);
|
||||
LogInfo("New connection from IP {0}:{1}", stream->GetRemoteIP(), ntohs(stream->GetRemotePort()));
|
||||
}
|
||||
);
|
||||
|
||||
while (RunLoops) {
|
||||
Timer::SetCurrentTime();
|
||||
@@ -626,7 +666,7 @@ int main(int argc, char** argv) {
|
||||
//check the stream identifier for any now-identified streams
|
||||
while ((eqsi = stream_identifier.PopIdentified())) {
|
||||
//now that we know what patch they are running, start up their client object
|
||||
struct in_addr in{};
|
||||
struct in_addr in{};
|
||||
in.s_addr = eqsi->GetRemoteIP();
|
||||
if (RuleB(World, UseBannedIPsTable)) { //Lieka: Check to see if we have the responsibility for blocking IPs.
|
||||
LogInfo("Checking inbound connection [{}] against BannedIPs table", inet_ntoa(in));
|
||||
@@ -642,7 +682,11 @@ int main(int argc, char** argv) {
|
||||
}
|
||||
}
|
||||
if (!RuleB(World, UseBannedIPsTable)) {
|
||||
LogInfo("New connection from [{}]:[{}], processing connection", inet_ntoa(in), ntohs(eqsi->GetRemotePort()));
|
||||
LogInfo(
|
||||
"New connection from [{}]:[{}], processing connection",
|
||||
inet_ntoa(in),
|
||||
ntohs(eqsi->GetRemotePort())
|
||||
);
|
||||
auto client = new Client(eqsi);
|
||||
// @merth: client->zoneattempt=0;
|
||||
client_list.Add(client);
|
||||
@@ -657,6 +701,7 @@ int main(int argc, char** argv) {
|
||||
database.PurgeExpiredInstances();
|
||||
database.PurgeAllDeletedDataBuckets();
|
||||
ExpeditionDatabase::PurgeExpiredCharacterLockouts();
|
||||
CharacterTaskTimersRepository::DeleteWhere(database, "expire_time <= NOW()");
|
||||
}
|
||||
|
||||
if (EQTimeTimer.Check()) {
|
||||
@@ -672,14 +717,18 @@ int main(int argc, char** argv) {
|
||||
launcher_list.Process();
|
||||
LFPGroupList.Process();
|
||||
adventure_manager.Process();
|
||||
expedition_state.Process();
|
||||
dynamic_zone_manager.Process();
|
||||
|
||||
if (InterserverTimer.Check()) {
|
||||
InterserverTimer.Start();
|
||||
database.ping();
|
||||
content_db.ping();
|
||||
|
||||
std::string window_title = StringFormat("World: %s Clients: %i", Config->LongName.c_str(), client_list.GetClientCount());
|
||||
std::string window_title = StringFormat(
|
||||
"World: %s Clients: %i",
|
||||
Config->LongName.c_str(),
|
||||
client_list.GetClientCount()
|
||||
);
|
||||
UpdateWindowTitle(window_title);
|
||||
}
|
||||
|
||||
@@ -696,12 +745,14 @@ int main(int argc, char** argv) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
void CatchSignal(int sig_num) {
|
||||
void CatchSignal(int sig_num)
|
||||
{
|
||||
LogInfo("Caught signal [{}]", sig_num);
|
||||
RunLoops = false;
|
||||
}
|
||||
|
||||
void UpdateWindowTitle(char* iNewTitle) {
|
||||
void UpdateWindowTitle(char *iNewTitle)
|
||||
{
|
||||
#ifdef _WINDOWS
|
||||
char tmp[500];
|
||||
if (iNewTitle) {
|
||||
@@ -714,18 +765,23 @@ void UpdateWindowTitle(char* iNewTitle) {
|
||||
#endif
|
||||
}
|
||||
|
||||
void CheckForServerScript(bool force_download) {
|
||||
void CheckForServerScript(bool force_download)
|
||||
{
|
||||
/* Fetch EQEmu Server script */
|
||||
if (!std::ifstream("eqemu_server.pl") || force_download) {
|
||||
|
||||
if(force_download)
|
||||
std::remove("eqemu_server.pl"); /* Delete local before fetch */
|
||||
if (force_download) {
|
||||
std::remove("eqemu_server.pl");
|
||||
} /* Delete local before fetch */
|
||||
|
||||
std::cout << "Pulling down EQEmu Server Maintenance Script (eqemu_server.pl)..." << std::endl;
|
||||
#ifdef _WIN32
|
||||
if(system("perl -MLWP::UserAgent -e \"require LWP::UserAgent; my $ua = LWP::UserAgent->new; $ua->timeout(10); $ua->env_proxy; my $response = $ua->get('https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_server.pl'); if ($response->is_success){ open(FILE, '> eqemu_server.pl'); print FILE $response->decoded_content; close(FILE); }\""));
|
||||
#else
|
||||
if(system("wget -N --no-check-certificate --quiet -O eqemu_server.pl https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_server.pl"));
|
||||
if (system(
|
||||
"wget -N --no-check-certificate --quiet -O eqemu_server.pl https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_server.pl"
|
||||
)) {}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,132 @@
|
||||
#ifndef EQEMU_SHARED_TASK_MANAGER_H
|
||||
#define EQEMU_SHARED_TASK_MANAGER_H
|
||||
|
||||
#include "../common/database.h"
|
||||
#include "../common/shared_tasks.h"
|
||||
|
||||
class DynamicZone;
|
||||
|
||||
namespace EQ {
|
||||
namespace Net {
|
||||
class DynamicPacket;
|
||||
}
|
||||
}
|
||||
|
||||
struct SharedTaskActiveInvitation {
|
||||
uint32 shared_task_id;
|
||||
uint32 character_id;
|
||||
};
|
||||
|
||||
class SharedTaskManager {
|
||||
public:
|
||||
SharedTaskManager *SetDatabase(Database *db);
|
||||
SharedTaskManager *SetContentDatabase(Database *db);
|
||||
|
||||
// loads task data into memory
|
||||
SharedTaskManager *LoadTaskData();
|
||||
|
||||
// loads shared task state into memory
|
||||
void LoadSharedTaskState();
|
||||
|
||||
// helper, references task memory data
|
||||
TasksRepository::Tasks GetSharedTaskDataByTaskId(uint32 task_id);
|
||||
std::vector<TaskActivitiesRepository::TaskActivities> GetSharedTaskActivityDataByTaskId(uint32 task_id);
|
||||
|
||||
// gets group / raid members belonging to requested character
|
||||
std::vector<SharedTaskMember> GetRequestMembers(
|
||||
uint32 requestor_character_id,
|
||||
const std::vector<CharacterDataRepository::CharacterData> &characters
|
||||
);
|
||||
|
||||
// client attempting to create a shared task
|
||||
void AttemptSharedTaskCreation(uint32 requested_task_id, uint32 requested_character_id, uint32 npc_type_id);
|
||||
void AttemptSharedTaskRemoval(uint32 requested_task_id, uint32 requested_character_id, bool remove_from_db);
|
||||
|
||||
// shared task activity update middleware
|
||||
void SharedTaskActivityUpdate(
|
||||
uint32 source_character_id,
|
||||
uint32 task_id,
|
||||
uint32 activity_id,
|
||||
uint32 done_count,
|
||||
bool ignore_quest_update
|
||||
);
|
||||
|
||||
SharedTask *FindSharedTaskByTaskIdAndCharacterId(uint32 task_id, uint32 character_id);
|
||||
SharedTask *FindSharedTaskById(int64 shared_task_id);
|
||||
|
||||
void DeleteSharedTask(int64 shared_task_id);
|
||||
void SaveSharedTaskActivityState(int64 shared_task_id, std::vector<SharedTaskActivityStateEntry> activity_state);
|
||||
|
||||
bool IsSharedTaskLeader(SharedTask *s, uint32 character_id);
|
||||
void SendAcceptNewSharedTaskPacket(uint32 character_id, uint32 task_id, uint32_t npc_context_id, int accept_time);
|
||||
void SendRemovePlayerFromSharedTaskPacket(uint32 character_id, uint32 task_id, bool remove_from_db);
|
||||
void SendSharedTaskMemberList(uint32 character_id, const std::vector<SharedTaskMember> &members);
|
||||
void SendSharedTaskMemberList(uint32 character_id, const EQ::Net::DynamicPacket &serialized_members);
|
||||
void SendSharedTaskMemberChange(
|
||||
uint32 character_id,
|
||||
int64 shared_task_id,
|
||||
const std::string &player_name,
|
||||
bool removed
|
||||
);
|
||||
void RemovePlayerFromSharedTask(SharedTask *s, uint32 character_id);
|
||||
void PrintSharedTaskState();
|
||||
void RemovePlayerFromSharedTaskByPlayerName(SharedTask *s, const std::string &character_name);
|
||||
void RemoveEveryoneFromSharedTask(SharedTask *s, uint32 requested_character_id);
|
||||
|
||||
void MakeLeaderByPlayerName(SharedTask *s, const std::string &character_name);
|
||||
void AddPlayerByCharacterIdAndName(SharedTask *s, int64 character_id, const std::string &character_name);
|
||||
void InvitePlayerByPlayerName(SharedTask *s, const std::string &player_name);
|
||||
|
||||
// invitations
|
||||
void QueueActiveInvitation(int64 shared_task_id, int64 character_id);
|
||||
bool IsInvitationActive(uint32 shared_task_id, uint32 character_id);
|
||||
void RemoveActiveInvitation(int64 shared_task_id, int64 character_id);
|
||||
void RemoveActiveInvitationByCharacterID(uint32_t character_id);
|
||||
|
||||
// dz
|
||||
void CreateDynamicZone(SharedTask *s, DynamicZone &dz_request);
|
||||
|
||||
void PurgeAllSharedTasks();
|
||||
|
||||
// messages
|
||||
void SendLeaderMessage(SharedTask *s, int chat_type, const std::string &message);
|
||||
void SendLeaderMessageID(SharedTask *s, int chat_type, int eqstr_id, std::initializer_list<std::string> args = {});
|
||||
void SendMembersMessage(SharedTask *s, int chat_type, const std::string &message);
|
||||
void SendMembersMessageID(SharedTask *s, int chat_type, int eqstr_id, std::initializer_list<std::string> args = {});
|
||||
|
||||
const std::vector<SharedTask> &GetSharedTasks() const;
|
||||
void SetSharedTasks(const std::vector<SharedTask> &shared_tasks);
|
||||
|
||||
SharedTaskManager * PurgeExpiredSharedTasks();
|
||||
protected:
|
||||
// reference to database
|
||||
Database *m_database;
|
||||
Database *m_content_database;
|
||||
|
||||
// reference to task data (all)
|
||||
std::vector<TasksRepository::Tasks> m_task_data{};
|
||||
std::vector<TaskActivitiesRepository::TaskActivities> m_task_activity_data{};
|
||||
|
||||
// internal shared tasks list
|
||||
std::vector<SharedTask> m_shared_tasks{};
|
||||
|
||||
// store a reference of active invitations that have been sent to players
|
||||
std::vector<SharedTaskActiveInvitation> m_active_invitations{};
|
||||
|
||||
void AddReplayTimers(SharedTask *s);
|
||||
bool CanAddPlayer(SharedTask *s, uint32_t character_id, std::string player_name, bool accepted);
|
||||
bool CanRequestSharedTask(uint32_t task_id, uint32_t character_id, const SharedTaskRequestCharacters &request);
|
||||
void ChooseNewLeader(SharedTask *s);
|
||||
void SendSharedTaskMemberListToAllMembers(SharedTask *s);
|
||||
void SendSharedTaskMemberAddedToAllMembers(SharedTask *s, const std::string &player_name);
|
||||
void SendSharedTaskMemberRemovedToAllMembers(SharedTask *s, const std::string &player_name);
|
||||
void SaveMembers(SharedTask *s, std::vector<SharedTaskMember> members);
|
||||
void SendSharedTaskInvitePacket(SharedTask *s, int64 invited_character_id);
|
||||
void RecordSharedTaskCompletion(SharedTask *s);
|
||||
void RemoveAllMembersFromDynamicZones(SharedTask *s);
|
||||
|
||||
// memory search
|
||||
std::vector<uint32_t> FindCharactersInSharedTasks(const std::vector<uint32_t> &find_characters);
|
||||
};
|
||||
|
||||
#endif //EQEMU_SHARED_TASK_MANAGER_H
|
||||
@@ -0,0 +1,355 @@
|
||||
#include "shared_task_world_messaging.h"
|
||||
#include "cliententry.h"
|
||||
#include "worlddb.h"
|
||||
#include "../common/shared_tasks.h"
|
||||
#include "../common/eqemu_logsys.h"
|
||||
#include "../common/repositories/tasks_repository.h"
|
||||
#include "../common/tasks.h"
|
||||
#include "cliententry.h"
|
||||
#include "clientlist.h"
|
||||
#include "zonelist.h"
|
||||
#include "zoneserver.h"
|
||||
#include "shared_task_manager.h"
|
||||
#include "../common/repositories/shared_task_members_repository.h"
|
||||
#include "../common/repositories/task_activities_repository.h"
|
||||
#include "dynamic_zone.h"
|
||||
|
||||
extern ClientList client_list;
|
||||
extern ZSList zoneserver_list;
|
||||
extern SharedTaskManager shared_task_manager;
|
||||
|
||||
void SharedTaskWorldMessaging::HandleZoneMessage(ServerPacket *pack)
|
||||
{
|
||||
switch (pack->opcode) {
|
||||
case ServerOP_SharedTaskRequest: {
|
||||
auto *r = (ServerSharedTaskRequest_Struct *) pack->pBuffer;
|
||||
LogTasksDetail(
|
||||
"[ServerOP_SharedTaskRequest] Received request from character [{}] task_id [{}] npc_type_id [{}]",
|
||||
r->requested_character_id,
|
||||
r->requested_task_id,
|
||||
r->requested_npc_type_id
|
||||
);
|
||||
|
||||
shared_task_manager.AttemptSharedTaskCreation(
|
||||
r->requested_task_id,
|
||||
r->requested_character_id,
|
||||
r->requested_npc_type_id
|
||||
);
|
||||
|
||||
break;
|
||||
}
|
||||
case ServerOP_SharedTaskAttemptRemove: {
|
||||
auto *r = (ServerSharedTaskAttemptRemove_Struct *) pack->pBuffer;
|
||||
LogTasksDetail(
|
||||
"[ServerOP_SharedTaskAttemptRemove] Received request from character [{}] task_id [{}] remove_from_db [{}]",
|
||||
r->requested_character_id,
|
||||
r->requested_task_id,
|
||||
r->remove_from_db
|
||||
);
|
||||
|
||||
shared_task_manager.AttemptSharedTaskRemoval(
|
||||
r->requested_task_id,
|
||||
r->requested_character_id,
|
||||
r->remove_from_db
|
||||
);
|
||||
|
||||
break;
|
||||
}
|
||||
case ServerOP_SharedTaskKickPlayers: {
|
||||
auto r = reinterpret_cast<ServerSharedTaskKickPlayers_Struct *>(pack->pBuffer);
|
||||
LogTasksDetail(
|
||||
"[ServerOP_SharedTaskKickPlayers] Received request from character [{}] task_id [{}]",
|
||||
r->source_character_id,
|
||||
r->task_id
|
||||
);
|
||||
|
||||
auto t = shared_task_manager.FindSharedTaskByTaskIdAndCharacterId(r->task_id, r->source_character_id);
|
||||
if (t) {
|
||||
auto leader = t->GetLeader();
|
||||
if (leader.character_id != r->source_character_id) {
|
||||
client_list.SendCharacterMessageID(
|
||||
r->source_character_id, Chat::Red,
|
||||
SharedTaskMessage::YOU_ARE_NOT_LEADER_COMMAND_ISSUE, {leader.character_name}
|
||||
);
|
||||
}
|
||||
else {
|
||||
shared_task_manager.RemoveEveryoneFromSharedTask(t, r->source_character_id);
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
case ServerOP_SharedTaskUpdate: {
|
||||
auto *r = (ServerSharedTaskActivityUpdate_Struct *) pack->pBuffer;
|
||||
|
||||
LogTasksDetail(
|
||||
"[ServerOP_SharedTaskUpdate] Received request from character [{}] task_id [{}] activity_id [{}] donecount [{}] ignore_quest_update [{}]",
|
||||
r->source_character_id,
|
||||
r->task_id,
|
||||
r->activity_id,
|
||||
r->done_count,
|
||||
(r->ignore_quest_update ? "true" : "false")
|
||||
);
|
||||
|
||||
shared_task_manager.SharedTaskActivityUpdate(
|
||||
r->source_character_id,
|
||||
r->task_id,
|
||||
r->activity_id,
|
||||
r->done_count,
|
||||
r->ignore_quest_update
|
||||
);
|
||||
|
||||
break;
|
||||
}
|
||||
case ServerOP_SharedTaskRequestMemberlist: {
|
||||
auto *r = (ServerSharedTaskRequestMemberlist_Struct *) pack->pBuffer;
|
||||
|
||||
LogTasksDetail(
|
||||
"[ServerOP_SharedTaskRequestMemberlist] Received request from character [{}] task_id [{}]",
|
||||
r->source_character_id,
|
||||
r->task_id
|
||||
);
|
||||
|
||||
auto t = shared_task_manager.FindSharedTaskByTaskIdAndCharacterId(r->task_id, r->source_character_id);
|
||||
if (t) {
|
||||
LogTasksDetail(
|
||||
"[ServerOP_SharedTaskRequestMemberlist] Found shared task character [{}] shared_task_id [{}]",
|
||||
r->source_character_id,
|
||||
t->GetDbSharedTask().id
|
||||
);
|
||||
|
||||
shared_task_manager.SendSharedTaskMemberList(
|
||||
r->source_character_id,
|
||||
t->GetMembers()
|
||||
);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
case ServerOP_SharedTaskRemovePlayer: {
|
||||
auto *r = (ServerSharedTaskRemovePlayer_Struct *) pack->pBuffer;
|
||||
|
||||
LogTasksDetail(
|
||||
"[ServerOP_SharedTaskRemovePlayer] Received request from character [{}] task_id [{}] player_name [{}]",
|
||||
r->source_character_id,
|
||||
r->task_id,
|
||||
r->player_name
|
||||
);
|
||||
|
||||
auto t = shared_task_manager.FindSharedTaskByTaskIdAndCharacterId(r->task_id, r->source_character_id);
|
||||
if (t) {
|
||||
LogTasksDetail(
|
||||
"[ServerOP_SharedTaskRemovePlayer] Found shared task character [{}] shared_task_id [{}]",
|
||||
r->source_character_id,
|
||||
t->GetDbSharedTask().id
|
||||
);
|
||||
|
||||
auto leader = t->GetLeader();
|
||||
if (leader.character_id != r->source_character_id) {
|
||||
client_list.SendCharacterMessageID(
|
||||
r->source_character_id, Chat::Red,
|
||||
SharedTaskMessage::YOU_ARE_NOT_LEADER_COMMAND_ISSUE, {leader.character_name}
|
||||
);
|
||||
}
|
||||
else {
|
||||
LogTasksDetail(
|
||||
"[ServerOP_SharedTaskRemovePlayer] character_id [{}] shared_task_id [{}] is_leader",
|
||||
r->source_character_id,
|
||||
t->GetDbSharedTask().id
|
||||
);
|
||||
|
||||
std::string character_name = r->player_name;
|
||||
shared_task_manager.RemovePlayerFromSharedTaskByPlayerName(t, character_name);
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
case ServerOP_SharedTaskMakeLeader: {
|
||||
auto *r = (ServerSharedTaskMakeLeader_Struct *) pack->pBuffer;
|
||||
|
||||
LogTasksDetail(
|
||||
"[ServerOP_SharedTaskMakeLeader] Received request from character [{}] task_id [{}] player_name [{}]",
|
||||
r->source_character_id,
|
||||
r->task_id,
|
||||
r->player_name
|
||||
);
|
||||
|
||||
auto t = shared_task_manager.FindSharedTaskByTaskIdAndCharacterId(r->task_id, r->source_character_id);
|
||||
if (t) {
|
||||
LogTasksDetail(
|
||||
"[ServerOP_SharedTaskMakeLeader] Found shared task character [{}] shared_task_id [{}]",
|
||||
r->source_character_id,
|
||||
t->GetDbSharedTask().id
|
||||
);
|
||||
|
||||
auto leader = t->GetLeader();
|
||||
if (leader.character_id != r->source_character_id) {
|
||||
client_list.SendCharacterMessageID(
|
||||
r->source_character_id, Chat::Red,
|
||||
SharedTaskMessage::YOU_ARE_NOT_LEADER_COMMAND_ISSUE, {leader.character_name}
|
||||
);
|
||||
}
|
||||
else if (strcasecmp(leader.character_name.c_str(), r->player_name) == 0) {
|
||||
client_list.SendCharacterMessageID(
|
||||
r->source_character_id,
|
||||
Chat::Red,
|
||||
SharedTaskMessage::YOU_ALREADY_LEADER
|
||||
);
|
||||
}
|
||||
else {
|
||||
LogTasksDetail(
|
||||
"[ServerOP_SharedTaskMakeLeader] character_id [{}] shared_task_id [{}] is_leader",
|
||||
r->source_character_id,
|
||||
t->GetDbSharedTask().id
|
||||
);
|
||||
|
||||
std::string character_name = r->player_name;
|
||||
shared_task_manager.MakeLeaderByPlayerName(t, character_name);
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
case ServerOP_SharedTaskAddPlayer: {
|
||||
auto *r = (ServerSharedTaskAddPlayer_Struct *) pack->pBuffer;
|
||||
|
||||
LogTasksDetail(
|
||||
"[ServerOP_SharedTaskAddPlayer] Received request from character [{}] task_id [{}] player_name [{}]",
|
||||
r->source_character_id,
|
||||
r->task_id,
|
||||
r->player_name
|
||||
);
|
||||
|
||||
auto t = shared_task_manager.FindSharedTaskByTaskIdAndCharacterId(r->task_id, r->source_character_id);
|
||||
if (t) {
|
||||
LogTasksDetail(
|
||||
"[ServerOP_SharedTaskAddPlayer] Found shared task character [{}] shared_task_id [{}]",
|
||||
r->source_character_id,
|
||||
t->GetDbSharedTask().id
|
||||
);
|
||||
|
||||
auto leader = t->GetLeader();
|
||||
if (leader.character_id != r->source_character_id) {
|
||||
// taskadd is client sided with System color in newer clients, server side might still be red
|
||||
client_list.SendCharacterMessageID(
|
||||
r->source_character_id, Chat::Red,
|
||||
SharedTaskMessage::YOU_ARE_NOT_LEADER_COMMAND_ISSUE, {leader.character_name}
|
||||
);
|
||||
}
|
||||
else {
|
||||
LogTasksDetail(
|
||||
"[ServerOP_SharedTaskAddPlayer] character_id [{}] shared_task_id [{}] is_leader",
|
||||
r->source_character_id,
|
||||
t->GetDbSharedTask().id
|
||||
);
|
||||
|
||||
std::string character_name = r->player_name;
|
||||
shared_task_manager.InvitePlayerByPlayerName(t, character_name);
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
case ServerOP_SharedTaskInviteAcceptedPlayer: {
|
||||
auto *r = (ServerSharedTaskInviteAccepted_Struct *) pack->pBuffer;
|
||||
|
||||
LogTasksDetail(
|
||||
"[ServerOP_SharedTaskInviteAcceptedPlayer] Received request from source_character_id [{}] shared_task_id [{}] accepted [{}]",
|
||||
r->source_character_id,
|
||||
r->shared_task_id,
|
||||
r->accepted
|
||||
);
|
||||
|
||||
auto t = shared_task_manager.FindSharedTaskById(r->shared_task_id);
|
||||
if (t && shared_task_manager.IsInvitationActive(r->shared_task_id, r->source_character_id)) {
|
||||
LogTasksDetail(
|
||||
"[ServerOP_SharedTaskInviteAcceptedPlayer] Found shared task character [{}] shared_task_id [{}]",
|
||||
r->source_character_id,
|
||||
t->GetDbSharedTask().id
|
||||
);
|
||||
|
||||
shared_task_manager.RemoveActiveInvitation(r->shared_task_id, r->source_character_id);
|
||||
|
||||
if (r->accepted) {
|
||||
shared_task_manager.AddPlayerByCharacterIdAndName(t, r->source_character_id, r->player_name);
|
||||
}
|
||||
else {
|
||||
shared_task_manager.SendLeaderMessageID(
|
||||
t,
|
||||
Chat::Red,
|
||||
SharedTaskMessage::PLAYER_DECLINED_OFFER,
|
||||
{r->player_name}
|
||||
);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
case ServerOP_SharedTaskCreateDynamicZone: {
|
||||
auto buf = reinterpret_cast<ServerSharedTaskCreateDynamicZone_Struct *>(pack->pBuffer);
|
||||
|
||||
LogTasksDetail(
|
||||
"[ServerOP_SharedTaskCreateDynamicZone] Received request from source_character_id [{}] task_id [{}]",
|
||||
buf->source_character_id,
|
||||
buf->task_id
|
||||
);
|
||||
|
||||
auto t = shared_task_manager.FindSharedTaskByTaskIdAndCharacterId(buf->task_id, buf->source_character_id);
|
||||
if (t) {
|
||||
DynamicZone dz;
|
||||
dz.LoadSerializedDzPacket(buf->cereal_data, buf->cereal_size);
|
||||
|
||||
shared_task_manager.CreateDynamicZone(t, dz);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case ServerOP_SharedTaskPurgeAllCommand: {
|
||||
LogTasksDetail("[ServerOP_SharedTaskPurgeAllCommand] Received request to purge all shared tasks");
|
||||
|
||||
shared_task_manager.PurgeAllSharedTasks();
|
||||
auto p = std::make_unique<ServerPacket>(
|
||||
ServerOP_SharedTaskPurgeAllCommand,
|
||||
0
|
||||
);
|
||||
|
||||
zoneserver_list.SendPacket(p.get());
|
||||
|
||||
break;
|
||||
}
|
||||
case ServerOP_SharedTaskPlayerList: {
|
||||
auto buf = reinterpret_cast<ServerSharedTaskPlayerList_Struct *>(pack->pBuffer);
|
||||
|
||||
LogTasksDetail(
|
||||
"[ServerOP_SharedTaskPlayerList] Received request from source_character_id [{}] task_id [{}]",
|
||||
buf->source_character_id,
|
||||
buf->task_id
|
||||
);
|
||||
|
||||
auto s = shared_task_manager.FindSharedTaskByTaskIdAndCharacterId(buf->task_id, buf->source_character_id);
|
||||
if (s) {
|
||||
std::vector<std::string> player_names;
|
||||
|
||||
for (const auto &member : s->GetMembers()) {
|
||||
player_names.emplace_back(member.character_name);
|
||||
|
||||
if (member.is_leader) {
|
||||
client_list.SendCharacterMessageID(
|
||||
buf->source_character_id, Chat::Yellow,
|
||||
SharedTaskMessage::LEADER_PRINT, {member.character_name}
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
std::string player_list = fmt::format("{}", fmt::join(player_names, ", "));
|
||||
client_list.SendCharacterMessageID(
|
||||
buf->source_character_id, Chat::Yellow,
|
||||
SharedTaskMessage::MEMBERS_PRINT, {player_list}
|
||||
);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
#ifndef EQEMU_SHARED_TASK_WORLD_MESSAGING_H
|
||||
#define EQEMU_SHARED_TASK_WORLD_MESSAGING_H
|
||||
|
||||
#include "../common/types.h"
|
||||
#include "../common/servertalk.h"
|
||||
#include "../common/shared_tasks.h"
|
||||
#include "../common/eqemu_logsys.h"
|
||||
#include "../common/repositories/tasks_repository.h"
|
||||
#include "../common/tasks.h"
|
||||
|
||||
class SharedTaskWorldMessaging {
|
||||
public:
|
||||
static void HandleZoneMessage(ServerPacket *pack);
|
||||
};
|
||||
|
||||
|
||||
#endif //EQEMU_SHARED_TASK_WORLD_MESSAGING_H
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <cstdlib>
|
||||
#include <vector>
|
||||
#include "sof_char_create_data.h"
|
||||
#include "../common/repositories/character_instance_safereturns_repository.h"
|
||||
#include "../common/repositories/criteria/content_filter_criteria.h"
|
||||
#include "world_store.h"
|
||||
|
||||
@@ -477,6 +478,54 @@ int WorldDatabase::MoveCharacterToBind(int character_id, uint8 bind_number)
|
||||
return zone_id;
|
||||
}
|
||||
|
||||
int WorldDatabase::MoveCharacterToInstanceSafeReturn(
|
||||
int character_id,
|
||||
int instance_zone_id,
|
||||
int instance_id
|
||||
)
|
||||
{
|
||||
int zone_id = 0;
|
||||
|
||||
// only moves if safe return is for specified zone instance
|
||||
auto entries = CharacterInstanceSafereturnsRepository::GetWhere(
|
||||
database,
|
||||
fmt::format(
|
||||
"character_id = {} AND instance_zone_id = {} AND instance_id = {} AND safe_zone_id > 0",
|
||||
character_id, instance_zone_id, instance_id
|
||||
)
|
||||
);
|
||||
|
||||
if (!entries.empty()) {
|
||||
auto entry = entries.front();
|
||||
|
||||
auto results = QueryDatabase(
|
||||
fmt::format(
|
||||
SQL(
|
||||
UPDATE character_data
|
||||
SET zone_id = {}, zone_instance = 0, x = {}, y = {}, z = {}, heading = {}
|
||||
WHERE id = {};
|
||||
),
|
||||
entry.safe_zone_id,
|
||||
entry.safe_x,
|
||||
entry.safe_y,
|
||||
entry.safe_z,
|
||||
entry.safe_heading,
|
||||
character_id
|
||||
)
|
||||
);
|
||||
|
||||
if (results.Success() && results.RowsAffected() > 0) {
|
||||
zone_id = entry.safe_zone_id;
|
||||
}
|
||||
}
|
||||
|
||||
if (zone_id == 0) {
|
||||
zone_id = MoveCharacterToBind(character_id);
|
||||
}
|
||||
|
||||
return zone_id;
|
||||
}
|
||||
|
||||
bool WorldDatabase::GetStartZone(
|
||||
PlayerProfile_Struct *p_player_profile_struct,
|
||||
CharCreate_Struct *p_char_create_struct,
|
||||
|
||||
@@ -32,6 +32,7 @@ public:
|
||||
bool GetStartZone(PlayerProfile_Struct* p_player_profile_struct, CharCreate_Struct* p_char_create_struct, bool is_titanium);
|
||||
void GetCharSelectInfo(uint32 account_id, EQApplicationPacket **out_app, uint32 client_version_bit);
|
||||
int MoveCharacterToBind(int character_id, uint8 bind_number = 0);
|
||||
int MoveCharacterToInstanceSafeReturn(int character_id, int instance_zone_id, int instance_id);
|
||||
|
||||
void GetLauncherList(std::vector<std::string> &result);
|
||||
bool GetCharacterLevel(const char *name, int &level);
|
||||
|
||||
+1
-1
@@ -43,7 +43,7 @@ ZSList::ZSList()
|
||||
memset(pLockedZones, 0, sizeof(pLockedZones));
|
||||
|
||||
m_tick = std::make_unique<EQ::Timer>(5000, true, std::bind(&ZSList::OnTick, this, std::placeholders::_1));
|
||||
m_keepalive = std::make_unique<EQ::Timer>(1500, true, std::bind(&ZSList::OnKeepAlive, this, std::placeholders::_1));
|
||||
m_keepalive = std::make_unique<EQ::Timer>(1000, true, std::bind(&ZSList::OnKeepAlive, this, std::placeholders::_1));
|
||||
}
|
||||
|
||||
ZSList::~ZSList() {
|
||||
|
||||
+25
-9
@@ -38,6 +38,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#include "world_store.h"
|
||||
#include "dynamic_zone.h"
|
||||
#include "expedition_message.h"
|
||||
#include "shared_task_world_messaging.h"
|
||||
#include "../common/shared_tasks.h"
|
||||
|
||||
extern ClientList client_list;
|
||||
extern GroupLFPList LFPGroupList;
|
||||
@@ -1181,7 +1183,6 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
|
||||
adventure_manager.IncrementAssassinationCount(*((uint16*)pack->pBuffer));
|
||||
break;
|
||||
}
|
||||
|
||||
case ServerOP_AdventureZoneData:
|
||||
{
|
||||
adventure_manager.GetZoneData(*((uint16*)pack->pBuffer));
|
||||
@@ -1368,17 +1369,28 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
|
||||
case ServerOP_ExpeditionLockoutDuration:
|
||||
case ServerOP_ExpeditionLockState:
|
||||
case ServerOP_ExpeditionReplayOnJoin:
|
||||
case ServerOP_ExpeditionExpireWarning:
|
||||
{
|
||||
zoneserver_list.SendPacket(pack);
|
||||
break;
|
||||
}
|
||||
case ServerOP_SharedTaskRequest:
|
||||
case ServerOP_SharedTaskAddPlayer:
|
||||
case ServerOP_SharedTaskAttemptRemove:
|
||||
case ServerOP_SharedTaskUpdate:
|
||||
case ServerOP_SharedTaskRequestMemberlist:
|
||||
case ServerOP_SharedTaskRemovePlayer:
|
||||
case ServerOP_SharedTaskInviteAcceptedPlayer:
|
||||
case ServerOP_SharedTaskMakeLeader:
|
||||
case ServerOP_SharedTaskCreateDynamicZone:
|
||||
case ServerOP_SharedTaskPurgeAllCommand:
|
||||
case ServerOP_SharedTaskPlayerList:
|
||||
case ServerOP_SharedTaskKickPlayers:
|
||||
{
|
||||
SharedTaskWorldMessaging::HandleZoneMessage(pack);
|
||||
break;
|
||||
}
|
||||
|
||||
case ServerOP_ExpeditionCreate:
|
||||
case ServerOP_ExpeditionGetMemberStatuses:
|
||||
case ServerOP_ExpeditionMemberChange:
|
||||
case ServerOP_ExpeditionMemberStatus:
|
||||
case ServerOP_ExpeditionMemberSwap:
|
||||
case ServerOP_ExpeditionMembersRemoved:
|
||||
case ServerOP_ExpeditionDzAddPlayer:
|
||||
case ServerOP_ExpeditionDzMakeLeader:
|
||||
case ServerOP_ExpeditionCharacterLockout:
|
||||
@@ -1388,12 +1400,16 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
|
||||
ExpeditionMessage::HandleZoneMessage(pack);
|
||||
break;
|
||||
}
|
||||
case ServerOP_DzAddRemoveCharacter:
|
||||
case ServerOP_DzRemoveAllCharacters:
|
||||
case ServerOP_DzCreated:
|
||||
case ServerOP_DzAddRemoveMember:
|
||||
case ServerOP_DzSwapMembers:
|
||||
case ServerOP_DzRemoveAllMembers:
|
||||
case ServerOP_DzGetMemberStatuses:
|
||||
case ServerOP_DzSetSecondsRemaining:
|
||||
case ServerOP_DzSetCompass:
|
||||
case ServerOP_DzSetSafeReturn:
|
||||
case ServerOP_DzSetZoneIn:
|
||||
case ServerOP_DzUpdateMemberStatus:
|
||||
{
|
||||
DynamicZone::HandleZoneMessage(pack);
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user