Techwizz/EQ2EMu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reintegrated full linkdead 120 second timer,, groups can have linkdead players remain in group

Browse source
This commit is contained in:
Emagi 2023-02-24 15:12:12 -05:00
parent 59c049cb08
commit c6bebcd532
3 changed files with 73 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
EQ2/source/WorldServer/client.cpp
View file

@ -148,6 +148,7 @@ Client::Client(EQStream* ieqs) : underworld_cooldown_timer(5000), pos_update(125
connected_to_zone = false;
connected = false;
camp_timer = 0;
linkdead_timer = 0;
client_zoning = false;
zoning_id = 0;
zoning_x = 0;
@ -234,6 +235,7 @@ Client::~Client() {
//safe_delete(autobootup_timeout);
safe_delete(linkdead_timer);
vector<QueuedQuest*>::iterator itr;
QueuedQuest* queued_quest = 0;
for (itr = quest_queue.begin(); itr != quest_queue.end(); itr++) {
@ -268,11 +270,7 @@ void Client::RemoveClientFromZone() {
player->GetZone()->GetSpellProcess()->RemoveSpellTimersFromSpawn(player, true, false, true, true);
if (current_zone && player) {
if (player->GetGroupMemberInfo())
{
if ((player->GetActivityStatus() & ACTIVITY_STATUS_LINKDEAD) > 0)
world.GetGroupManager()->RemoveGroupMember(player->GetGroupMemberInfo()->group_id, player);
else
if (player->GetGroupMemberInfo()) {
TempRemoveGroup();
}
world.GetGroupManager()->ClearPendingInvite(player);
@ -1195,7 +1193,7 @@ bool Client::HandlePacket(EQApplicationPacket* app) {
response->getType_int8_ByName("camp_desktop"),
response->getType_int8_ByName("camp_char_select"),
(response->getType_EQ2_16BitString_ByName("char_name").data.length() > 0) ? response->getType_EQ2_16BitString_ByName("char_name").data.c_str() : "");
// JA: trying to recognize /camp vs LD (see ZoneServer::ClientProcess())
if ((player->GetActivityStatus() & ACTIVITY_STATUS_CAMPING) == 0)
player->SetActivityStatus(player->GetActivityStatus() + ACTIVITY_STATUS_CAMPING);
@ -3154,6 +3152,28 @@ void Client::HandleQuickbarUpdateRequest(EQApplicationPacket* app) {
}
bool Client::Process(bool zone_process) {
bool ret = true;
// EQS can become null if player is linkdead, we want to always be able to process the camp/linkdead timers when active
if ((camp_timer && camp_timer->Check()) || (linkdead_timer && linkdead_timer->Check())) {
ResetSendMail();
if(getConnection())
getConnection()->SendDisconnect(false);
safe_delete(camp_timer);
if(linkdead_timer) {
LogWrite(CCLIENT__DEBUG, 0, "Client", "Player %s triggered linkdead timer, disconnecting", GetPlayer()->GetName());
// we remove the linkdead status and force a camp out immediately
if((GetPlayer()->GetActivityStatus() & ACTIVITY_STATUS_LINKDEAD) > 0) {
GetPlayer()->SetActivityStatus(GetPlayer()->GetActivityStatus() - ACTIVITY_STATUS_LINKDEAD);
}
if ((GetPlayer()->GetActivityStatus() & ACTIVITY_STATUS_CAMPING) == 0) {
GetPlayer()->SetActivityStatus(GetPlayer()->GetActivityStatus() + ACTIVITY_STATUS_CAMPING);
}
}
safe_delete(linkdead_timer);
ret = false;
}
if (!eqs) {
return false;
}
@ -3178,8 +3198,6 @@ bool Client::Process(bool zone_process) {
break;
}
}
bool ret = true;
sockaddr_in to;
memset((char*)&to, 0, sizeof(to));
@ -3373,14 +3391,6 @@ bool Client::Process(bool zone_process) {
if (player->ControlFlagsChanged())
player->SendControlFlagUpdates(this);
if (camp_timer && camp_timer->Check()) {
ResetSendMail();
if(getConnection())
getConnection()->SendDisconnect(false);
safe_delete(camp_timer);
ret = false;
}
if (!eqs || (eqs && !eqs->CheckActive()))
ret = false;
@ -11753,4 +11763,26 @@ bool Client::CheckConsumptionAllowed(int16 slot, bool send_message) {
}
return true;
}
void Client::StartLinkdeadTimer() {
if(!linkdead_timer) {
int32 LD_Timer = rule_manager.GetGlobalRule(R_World, LinkDeadTimer)->GetInt32();
LogWrite(CCLIENT__DEBUG, 0, "Client", "Starting linkdead timer for %s (timer %u seconds)", GetPlayer()->GetName(), (LD_Timer/1000));
linkdead_timer = new Timer(LD_Timer);
linkdead_timer->Enable();
if(GetPlayer()->GetGroupMemberInfo()) {
LogWrite(CCLIENT__DEBUG, 0, "Client", "Telling player %s group they are disconnecting", GetPlayer()->GetName());
world.GetGroupManager()->GroupMessage(GetPlayer()->GetGroupMemberInfo()->group_id, "%s has gone Linkdead.", GetPlayer()->GetName());
}
}
}
bool Client::IsLinkdeadTimerEnabled() {
if(linkdead_timer) {
return linkdead_timer->Enabled();
}
return false;
}

4
EQ2/source/WorldServer/client.h
View file

@ -580,6 +580,9 @@ public:
bool SetPetName(const char* name);
bool CheckConsumptionAllowed(int16 slot, bool send_message = true);
void StartLinkdeadTimer();
bool IsLinkdeadTimerEnabled();
private:
void SavePlayerImages();
void SkillChanged(Skill* skill, int16 previous_value, int16 new_value);
@ -637,6 +640,7 @@ private:
Timer* CLE_keepalive_timer;
Timer* connect;
Timer* camp_timer;
Timer* linkdead_timer;
bool connected;
std::atomic<bool> ready_for_spawns;
std::atomic<bool> ready_for_updates;

33
EQ2/source/WorldServer/zoneserver.cpp
View file

@ -3408,23 +3408,31 @@ void ZoneServer::ClientProcess()
}
if(!zoneShuttingDown && !client->IsZoning())
{
LogWrite(ZONE__DEBUG, 0, "Zone", "Client is disconnecting in %s (camping = %s)", __FUNCTION__, (client->GetPlayer()->GetActivityStatus() & ACTIVITY_STATUS_CAMPING) == 0 ? "false" : "true");
if( (client->GetPlayer()->GetActivityStatus() & ACTIVITY_STATUS_CAMPING) == 0 )
// avoid spam of messages while we await linkdead to complete
if(!client->IsLinkdeadTimerEnabled()) {
LogWrite(ZONE__DEBUG, 0, "Zone", "Client is disconnecting in %s (camping = %s)", __FUNCTION__, (client->GetPlayer()->GetActivityStatus() & ACTIVITY_STATUS_CAMPING) == 0 ? "false" : "true");
}
if((client->GetPlayer()->GetActivityStatus() & ACTIVITY_STATUS_LINKDEAD) > 0) {
client->StartLinkdeadTimer();
}
else if( (client->GetPlayer()->GetActivityStatus() & ACTIVITY_STATUS_CAMPING) == 0 )
{
//only set LD flag if we're disconnecting but not camping/quitting
client->GetPlayer()->SetActivityStatus(client->GetPlayer()->GetActivityStatus() + ACTIVITY_STATUS_LINKDEAD);
if(client->GetPlayer()->GetGroupMemberInfo())
{
LogWrite(ZONE__DEBUG, 0, "Zone", "Telling client's group they are disconnecting");
world.GetGroupManager()->GroupMessage(client->GetPlayer()->GetGroupMemberInfo()->group_id, "%s has gone Linkdead.", client->GetPlayer()->GetName());
}
client->StartLinkdeadTimer();
}
else {
// camp timer completed, remove client
RemoveClient(client);
client->Disconnect();
}
}
RemoveClient(client);
client->Disconnect();
else {
// force boot all players or clients zoning
RemoveClient(client);
client->Disconnect();
}
}
#ifndef NO_CATCH
}
@ -3437,6 +3445,7 @@ void ZoneServer::ClientProcess()
if( (client->GetPlayer()->GetActivityStatus() & ACTIVITY_STATUS_CAMPING) == 0 )
{
client->GetPlayer()->SetActivityStatus(client->GetPlayer()->GetActivityStatus() + ACTIVITY_STATUS_LINKDEAD);
client->StartLinkdeadTimer();
if(client->GetPlayer()->GetGroupMemberInfo())
world.GetGroupManager()->GroupMessage(client->GetPlayer()->GetGroupMemberInfo()->group_id, "%s has gone Linkdead.", client->GetPlayer()->GetName());
}