Remove the IsBeingDeleted guard that skipped spatial database cleanup in ~CClientEntity, leaving dangling pointers in the R-tree when entities were freed between resource stop iterations. Also reorder the IsBeingDeleted check in the GetElementsWithinRange lambda to filter zombie entities before accessing their members.

Author: Dutchman101

Client/mods/deathmatch/logic/CClientEntity.cpp

@@ -146,8 +146,7 @@ CClientEntity::~CClientEntity()
     }
 
     // Remove from spatial database
-    if (!g_pClientGame->IsBeingDeleted())
-        GetClientSpatialDatabase()->RemoveEntity(this);
+    GetClientSpatialDatabase()->RemoveEntity(this);
 
     // Ensure not referenced in the disabled collisions list
     assert(!MapContains(g_pClientGame->m_AllDisabledCollisions, this));

Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp

@@ -980,6 +980,9 @@ CClientEntityResult CLuaElementDefs::GetElementsWithinRange(CVector pos, float r
         result.erase(std::remove_if(result.begin(), result.end(),
                                     [&, radiusSq = radius * radius](CElement* pElement)
                                     {
+                                        if (pElement->IsBeingDeleted())
+                                            return true;
+
                                         if (typeHash && typeHash != pElement->GetTypeHash())
                                             return true;
 
@@ -995,7 +998,7 @@ CClientEntityResult CLuaElementDefs::GetElementsWithinRange(CVector pos, float r
                                         if ((elementPos - pos).LengthSquared() > radiusSq)
                                             return true;
 
-                                        return pElement->IsBeingDeleted();
+                                        return false;
                                     }),
                      result.end());
     }