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

On zone shutdown purge all spells pending to be deleted so we do not reference dead spell->zone ptr

Browse Source
This commit is contained in:
Emagi 2025-08-08 14:40:30 -04:00
parent 480086d85d
commit 4d0ef974ae
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/WorldServer/LuaInterface.cpp
View File

@ -1867,7 +1867,7 @@ void LuaInterface::AddUserDataPtr(LUAUserData* data, void* data_ptr) {
user_data[data] = Timer::GetCurrentTime2() + 300000; //allow a function to use this pointer for 5 minutes user_data[data] = Timer::GetCurrentTime2() + 300000; //allow a function to use this pointer for 5 minutes
} }
void LuaInterface::DeletePendingSpells(bool all) { void LuaInterface::DeletePendingSpells(bool all, ZoneServer* zone) {
MSpells.lock(); MSpells.lock();
MSpellDelete.lock(); MSpellDelete.lock();
if (spells_pending_delete.size() > 0) { if (spells_pending_delete.size() > 0) {
@ -1876,7 +1876,7 @@ void LuaInterface::DeletePendingSpells(bool all) {
vector<LuaSpell*> tmp_deletes; vector<LuaSpell*> tmp_deletes;
vector<LuaSpell*>::iterator del_itr; vector<LuaSpell*>::iterator del_itr;
for (itr = spells_pending_delete.begin(); itr != spells_pending_delete.end(); itr++) { for (itr = spells_pending_delete.begin(); itr != spells_pending_delete.end(); itr++) {
if (all || time >= itr->second) if ((!zone && (all || time >= itr->second)) || (zone && itr->first->zone == zone))
tmp_deletes.push_back(itr->first); tmp_deletes.push_back(itr->first);
} }
LuaSpell* spell = 0; LuaSpell* spell = 0;

2
source/WorldServer/LuaInterface.h
View File

@ -520,7 +520,7 @@ public:
map<Client*, int32> GetDebugClients(){ return debug_clients; } map<Client*, int32> GetDebugClients(){ return debug_clients; }
void AddUserDataPtr(LUAUserData* data, void* data_ptr = 0); void AddUserDataPtr(LUAUserData* data, void* data_ptr = 0);
void DeleteUserDataPtrs(bool all); void DeleteUserDataPtrs(bool all);
void DeletePendingSpells(bool all); void DeletePendingSpells(bool all, ZoneServer* zone = nullptr);
void DeletePendingSpell(LuaSpell* spell); void DeletePendingSpell(LuaSpell* spell);
Mutex* GetSpawnScriptMutex(const char* name); Mutex* GetSpawnScriptMutex(const char* name);
Mutex* GetItemScriptMutex(const char* name); Mutex* GetItemScriptMutex(const char* name);

1
source/WorldServer/zoneserver.cpp
View File

@ -190,6 +190,7 @@ ZoneServer::ZoneServer(const char* name) {
typedef map <int32, bool> ChangedSpawnMapType; typedef map <int32, bool> ChangedSpawnMapType;
ZoneServer::~ZoneServer() { ZoneServer::~ZoneServer() {
lua_interface->DeletePendingSpells(true, this);
zoneShuttingDown = true; //ensure other threads shut down too zoneShuttingDown = true; //ensure other threads shut down too
//allow other threads to properly shut down //allow other threads to properly shut down
if(is_initialized) { if(is_initialized) {