aboutsummaryrefslogtreecommitdiff
path: root/src/ban.cpp
Commit message (Collapse)AuthorAge
* Add unittests on ActiveObject and BanManager class (#6866)Loïc Blot2018-01-01
| | | | | | * Add unittests on ActiveObject and BanManager class This also permit to fix a bug in ban manager setting bans modified when no modification occurs
* Banmanager: Move 'creating' message from warningstream to infostream (#6277)Paramat2017-08-19
|
* bab.cpp: code modernizationLoic Blot2017-08-15
| | | | | | * Use for range based loops * Simplify some tests * Code style fixes
* C++11 patchset 9: move hardcoded init parameters to class definitions (part ↵Loïc Blot2017-06-16
| | | | | | | | | | | | | | | | | | | | | | | | 1) (#5984) * C++11 patchset 9: move hardcoded init parameters to class definitions C++11 introduced the possibility to define the default values directly in class definitions, do it on current code Also remove some unused attributes * CollisionInfo::bouncy * collisionMoveResult::collides_xy * collisionMoveResult::standing_on_unloaded * Clouds::speed * More constructor cleanups + some variables removal * remove only write guiFormSpecMenu::m_old_tooltip * move header included inside defintions in genericobject.h * remove some unused since years exception classes * remove unused & empty debug_stacks_init * remove unused & empty content_nodemeta_serialize_legacy * remove forgotten useless bool (bouncy) in collision.cpp code
* Clean up StrfndShadowNinja2016-03-19
| | | | | | | | | | | Changes: * Fix indentation. * Pass strings by const reference. * Merge Strfnd and WStrfnd into one class instead of copying them. * Remove trailing spaces. * Fix variable names. * Move to util. * Other miscellaneous style fixes.
* Use warningstream for log messages with WARNINGShadowNinja2015-10-14
| | | | Remove DTIME macro and its uses, too
* Clean up threadingShadowNinja2015-08-23
| | | | | | | | | | | | | | | | | | | | * Rename everything. * Strip J prefix. * Change UpperCamelCase functions to lowerCamelCase. * Remove global (!) semaphore count mutex on OSX. * Remove semaphore count getter (unused, unsafe, depended on internal API functions on Windows, and used a hack on OSX). * Add `Atomic<type>`. * Make `Thread` handle thread names. * Add support for C++11 multi-threading. * Combine pthread and win32 sources. * Remove `ThreadStarted` (unused, unneeded). * Move some includes from the headers to the sources. * Move all of `Event` into its header (allows inlining with no new includes). * Make `Event` use `Semaphore` (except on Windows). * Move some porting functions into `Thread`. * Integrate logging with `Thread`. * Add threading test.
* Replace instances of std::map<std::string, std::string> with StringMapkwolekr2015-05-19
| | | | | | Also, clean up surrounding code style Replace by-value parameter passing with const refs when possible Fix post-increment of iterators
* ban.cpp refactoringSelat2014-08-22
|
* Cleanup jthread and fix win32 buildsapier2013-12-01
|
* Always use builtin JThread librarykwolekr2013-09-15
|
* Omnicleanup: header cleanup, add ModApiUtil shared between game and mainmenuKahrl2013-08-14
|
* Fix typosPilzAdam2013-08-14
|
* Dont write directly to files but rather write and copy a tmp filePilzAdam2013-08-13
|
* Update Copyright YearsSfan52013-02-24
|
* Change Minetest-c55 to MinetestPilzAdam2013-02-24
|
* Switch the license to be LGPLv2/later, with small parts still remaining as ↵Perttu Ahola2012-06-05
| | | | GPLv2/later, by agreement of major contributors
* Fix log output in ban.cppPerttu Ahola2012-03-11
|
* Ban and Auth managers use infostream rather than dstreamPerttu Ahola2012-03-10
|
* Fixed/extended/modified ban stuff to be good for inclusionPerttu Ahola2011-08-12
|
* added ipban supportConstantin Wenger2011-08-12
commands: /#ipban <nick> /#ipunban <ip>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-03 18:01:16 +0000
eaStore(); #else return new VectorAreaStore(); #endif } const Area *AreaStore::getArea(u32 id) const { AreaMap::const_iterator it = areas_map.find(id); if (it == areas_map.end()) return nullptr; return &it->second; } void AreaStore::serialize(std::ostream &os) const { // WARNING: // Before 5.1.0-dev: version != 0 throws SerializationError // After 5.1.0-dev: version >= 5 throws SerializationError // Forwards-compatibility is assumed before version 5. writeU8(os, 0); // Serialisation version // TODO: Compression? writeU16(os, areas_map.size()); for (const auto &it : areas_map) { const Area &a = it.second; writeV3S16(os, a.minedge); writeV3S16(os, a.maxedge); writeU16(os, a.data.size()); os.write(a.data.data(), a.data.size()); } // Serialize IDs for (const auto &it : areas_map) writeU32(os, it.second.id); } void AreaStore::deserialize(std::istream &is) { u8 ver = readU8(is); // Assume forwards-compatibility before version 5 if (ver >= 5) throw SerializationError("Unknown AreaStore " "serialization version!"); u16 num_areas = readU16(is); std::vector<Area> areas; areas.reserve(num_areas); for (u32 i = 0; i < num_areas; ++i) { Area a(U32_MAX); a.minedge = readV3S16(is); a.maxedge = readV3S16(is); u16 data_len = readU16(is); a.data = std::string(data_len, '\0'); is.read(&a.data[0], data_len); areas.emplace_back(std::move(a)); } bool read_ids = is.good(); // EOF for old formats for (auto &area : areas) { if (read_ids) area.id = readU32(is); insertArea(&area); } } void AreaStore::invalidateCache() { if (m_cache_enabled) { m_res_cache.invalidate(); } } u32 AreaStore::getNextId() const { u32 free_id = 0; for (const auto &area : areas_map) { if (area.first > free_id) return free_id; // Found gap free_id = area.first + 1; } // End of map return free_id; } void AreaStore::setCacheParams(bool enabled, u8 block_radius, size_t limit) { m_cache_enabled = enabled; m_cacheblock_radius = MYMAX(block_radius, 16); m_res_cache.setLimit(MYMAX(limit, 20)); invalidateCache(); } void AreaStore::cacheMiss(void *data, const v3s16 &mpos, std::vector<Area *> *dest) { AreaStore *as = (AreaStore *)data; u8 r = as->m_cacheblock_radius; // get the points at the edges of the mapblock v3s16 minedge(mpos.X * r, mpos.Y * r, mpos.Z * r); v3s16 maxedge( minedge.X + r - 1, minedge.Y + r - 1, minedge.Z + r - 1); as->getAreasInArea(dest, minedge, maxedge, true); /* infostream << "Cache miss with " << dest->size() << " areas, between (" << minedge.X << ", " << minedge.Y << ", " << minedge.Z << ") and (" << maxedge.X << ", " << maxedge.Y << ", " << maxedge.Z << ")" << std::endl; // */ } void AreaStore::getAreasForPos(std::vector<Area *> *result, v3s16 pos) { if (m_cache_enabled) { v3s16 mblock = getContainerPos(pos, m_cacheblock_radius); const std::vector<Area *> *pre_list = m_res_cache.lookupCache(mblock); size_t s_p_l = pre_list->size(); for (size_t i = 0; i < s_p_l; i++) { Area *b = (*pre_list)[i]; if (AST_CONTAINS_PT(b, pos)) { result->push_back(b); } } } else { return getAreasForPosImpl(result, pos); } } //// // VectorAreaStore //// bool VectorAreaStore::insertArea(Area *a) { if (a->id == U32_MAX) a->id = getNextId(); std::pair<AreaMap::iterator, bool> res = areas_map.insert(std::make_pair(a->id, *a)); if (!res.second) // ID is not unique return false; m_areas.push_back(&res.first->second); invalidateCache(); return true; } bool VectorAreaStore::removeArea(u32 id) { AreaMap::iterator it = areas_map.find(id); if (it == areas_map.end()) return false; Area *a = &it->second; for (std::vector<Area *>::iterator v_it = m_areas.begin(); v_it != m_areas.end(); ++v_it) { if (*v_it == a) { m_areas.erase(v_it); break; } } areas_map.erase(it); invalidateCache(); return true; } void VectorAreaStore::getAreasForPosImpl(std::vector<Area *> *result, v3s16 pos) { for (Area *area : m_areas) { if (AST_CONTAINS_PT(area, pos)) { result->push_back(area); } } } void VectorAreaStore::getAreasInArea(std::vector<Area *> *result, v3s16 minedge, v3s16 maxedge, bool accept_overlap) { for (Area *area : m_areas) { if (accept_overlap ? AST_AREAS_OVERLAP(minedge, maxedge, area) : AST_CONTAINS_AREA(minedge, maxedge, area)) { result->push_back(area); } } } #if USE_SPATIAL static inline SpatialIndex::Region get_spatial_region(const v3s16 minedge, const v3s16 maxedge) { const double p_low[] = {(double)minedge.X, (double)minedge.Y, (double)minedge.Z}; const double p_high[] = {(double)maxedge.X, (double)maxedge.Y, (double)maxedge.Z}; return SpatialIndex::Region(p_low, p_high, 3); } static inline SpatialIndex::Point get_spatial_point(const v3s16 pos) { const double p[] = {(double)pos.X, (double)pos.Y, (double)pos.Z}; return SpatialIndex::Point(p, 3); } bool SpatialAreaStore::insertArea(Area *a) { if (a->id == U32_MAX) a->id = getNextId(); if (!areas_map.insert(std::make_pair(a->id, *a)).second) // ID is not unique return false; m_tree->insertData(0, nullptr, get_spatial_region(a->minedge, a->maxedge), a->id); invalidateCache(); return true; } bool SpatialAreaStore::removeArea(u32 id) { std::map<u32, Area>::iterator itr = areas_map.find(id); if (itr != areas_map.end()) { Area *a = &itr->second; bool result = m_tree->deleteData(get_spatial_region(a->minedge, a->maxedge), id); areas_map.erase(itr); invalidateCache(); return result; } else { return false; } } void SpatialAreaStore::getAreasForPosImpl(std::vector<Area *> *result, v3s16 pos) { VectorResultVisitor visitor(result, this); m_tree->pointLocationQuery(get_spatial_point(pos), visitor); } void SpatialAreaStore::getAreasInArea(std::vector<Area *> *result, v3s16 minedge, v3s16 maxedge, bool accept_overlap) { VectorResultVisitor visitor(result, this); if (accept_overlap) { m_tree->intersectsWithQuery(get_spatial_region(minedge, maxedge), visitor); } else { m_tree->containsWhatQuery(get_spatial_region(minedge, maxedge), visitor); } } SpatialAreaStore::~SpatialAreaStore() { delete m_tree; } SpatialAreaStore::SpatialAreaStore() { m_storagemanager = SpatialIndex::StorageManager::createNewMemoryStorageManager(); SpatialIndex::id_type id; m_tree = SpatialIndex::RTree::createNewRTree( *m_storagemanager, .7, // Fill factor 100, // Index capacity 100, // Leaf capacity 3, // dimension :) SpatialIndex::RTree::RV_RSTAR, id); } #endif
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-03 18:01:11 +0000