pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-10 23:20:25 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Zoning] Fix zone race condition (#2479)

Browse Source 
* Testing

* Separate auto shutdown fix

* Revert for PR

* Invalidate lock in places where zoning is cancelled
This commit is contained in:
Chris Miles
2022-10-11 21:23:27 -04:00
committed by GitHub
parent 18bfee5616
commit bc72641eef
4 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client.cpp
+20 -6
View File
@@ -232,8 +232,9 @@ Client::Client(EQStreamInterface* ieqs)
linkdead_timer.Disable();
zonesummon_id = 0;
zonesummon_ignorerestrictions = 0;
bZoning = false;
zone_mode = ZoneUnsolicited;
bZoning = false;
m_lock_save_position = false;
zone_mode = ZoneUnsolicited;
casting_spell_id = 0;
npcflag = false;
npclevel = 0;
@@ -634,11 +635,14 @@ bool Client::Save(uint8 iCommitNow) {
return false;
/* Wrote current basics to PP for saves */
m_pp.x = m_Position.x;
m_pp.y = m_Position.y;
m_pp.z = m_Position.z;
if (!m_lock_save_position) {
m_pp.x = m_Position.x;
m_pp.y = m_Position.y;
m_pp.z = m_Position.z;
m_pp.heading = m_Position.w;
}
m_pp.guildrank = guildrank;
m_pp.heading = m_Position.w;
/* Mana and HP */
if (GetHP() <= 0) {
@@ -11827,3 +11831,13 @@ bool Client::HasRecipeLearned(uint32 recipe_id)
return false;
}
bool Client::IsLockSavePosition() const
{
return m_lock_save_position;
}
void Client::SetLockSavePosition(bool lock_save_position)
{
Client::m_lock_save_position = lock_save_position;
}