EQ2/Emu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addressing a number of coincidental lock conditions with removing a dead spawn (out of order), clearing hate (deadlock due to early dead spawn removal), saving a player to database (before player loaded)

Browse Source
This commit is contained in:
Emagi 2025-07-31 18:38:39 -04:00
parent 6e25f0062f
commit 6a6573e339
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/WorldServer/NPC_AI.h
View File

@ -60,7 +60,7 @@ public:
/// <param name="hate">The amount of hate to add</param> /// <param name="hate">The amount of hate to add</param>
virtual void AddHate(Entity* entity, sint32 hate); virtual void AddHate(Entity* entity, sint32 hate);
/// <summary>Completely clears the hate list for this npc</summary> /// <summary>Completely clears the hate list for this npc</summary>
void ClearHate(bool lockSpawnList = true); void ClearHate(bool lockSpawnList = false);
/// <summary>Removes the given entity from this NPC's hate list</summary> /// <summary>Removes the given entity from this NPC's hate list</summary>
/// <param name="entity">Entity to remove from this NPC's hate list</param> /// <param name="entity">Entity to remove from this NPC's hate list</param>
void ClearHate(Entity* entity); void ClearHate(Entity* entity);

2
source/WorldServer/client.cpp
View File

@ -5307,7 +5307,7 @@ void Client::DetermineCharacterUpdates() {
} }
void Client::Save() { void Client::Save() {
if (GetCharacterID() == 0 || IsSaveDisabled()) if (GetCharacterID() == 0 || IsSaveDisabled() || !IsReadyForUpdates())
return; return;
if (current_zone) { if (current_zone) {

12
source/WorldServer/zoneserver.cpp
View File

@ -1517,7 +1517,6 @@ void ZoneServer::DeleteSpawns(bool delete_all) {
if(to_process.size() > 0) { if(to_process.size() > 0) {
to_keep.reserve(to_process.size()); to_keep.reserve(to_process.size());
int32 current_time = Timer::GetCurrentTime2(); int32 current_time = Timer::GetCurrentTime2();
MSpawnList.writelock(__FUNCTION__, __LINE__);
for (auto &entry : to_process) { for (auto &entry : to_process) {
Spawn* spawn = entry.first; Spawn* spawn = entry.first;
int32 when = entry.second; int32 when = entry.second;
@ -1533,6 +1532,7 @@ void ZoneServer::DeleteSpawns(bool delete_all) {
spellProcess->RemoveCaster(spawn, true); spellProcess->RemoveCaster(spawn, true);
} }
MSpawnList.writelock(__FUNCTION__, __LINE__);
if(spawn->IsEntity() && movementMgr != nullptr) { if(spawn->IsEntity() && movementMgr != nullptr) {
movementMgr->RemoveMob((Entity*)spawn); movementMgr->RemoveMob((Entity*)spawn);
} }
@ -1563,9 +1563,9 @@ void ZoneServer::DeleteSpawns(bool delete_all) {
} }
housing_spawn_map.erase(spawn->GetID()); housing_spawn_map.erase(spawn->GetID());
} }
MSpawnList.releasewritelock(__FUNCTION__, __LINE__);
safe_delete(spawn); safe_delete(spawn);
} }
MSpawnList.releasewritelock(__FUNCTION__, __LINE__);
} }
// Add all the kept entries // Add all the kept entries
@ -5403,10 +5403,6 @@ void ZoneServer::KillSpawn(bool spawnListLocked, Spawn* dead, Spawn* killer, boo
// the corpse has loot or not if the timer value (pop_timer) is 0xFFFFFFFF // the corpse has loot or not if the timer value (pop_timer) is 0xFFFFFFFF
} }
} }
// If the dead spawns was not a player add it to the dead spawn list
if (!dead->IsPlayer() && !dead->IsBot())
AddDeadSpawn(dead, pop_timer);
// if dead was a player clear hostile spells from its spell queue // if dead was a player clear hostile spells from its spell queue
if (dead->IsPlayer()) if (dead->IsPlayer())
@ -5439,6 +5435,10 @@ void ZoneServer::KillSpawn(bool spawnListLocked, Spawn* dead, Spawn* killer, boo
} }
} }
} }
// If the dead spawns was not a player add it to the dead spawn list
if (!dead->IsPlayer() && !dead->IsBot())
AddDeadSpawn(dead, pop_timer);
} }
void ZoneServer::SendDamagePacket(Spawn* attacker, Spawn* victim, int8 type1, int8 type2, int8 damage_type, int16 damage, const char* spell_name) { void ZoneServer::SendDamagePacket(Spawn* attacker, Spawn* victim, int8 type1, int8 type2, int8 damage_type, int16 damage, const char* spell_name) {