Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-07-04 15:05:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs

Browse Source
This commit is contained in:
Lars Mueller 2024-05-20 01:52:32 +02:00
parent 2bcb715386
commit e305d2c138
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/activeobjectmgr.h
View File

@ -55,7 +55,7 @@ class ActiveObjectMgr
for (auto &it : m_active_objects.iter()) { for (auto &it : m_active_objects.iter()) {
if (!it.second) if (!it.second)
continue; continue;
m_active_objects.remove(it.first); removeObject(it.first);
} }
} while (!m_active_objects.empty()); } while (!m_active_objects.empty());
} }

3
src/server/activeobjectmgr.cpp
View File

@ -41,7 +41,7 @@ void ActiveObjectMgr::clearIf(const std::function<bool(ServerActiveObject *, u16
continue; continue;
if (cb(it.second.get(), it.first)) { if (cb(it.second.get(), it.first)) {
// Remove reference from m_active_objects // Remove reference from m_active_objects
m_active_objects.remove(it.first); removeObject(it.first);
} }
} }
} }
@ -94,6 +94,7 @@ bool ActiveObjectMgr::registerObject(std::unique_ptr<ServerActiveObject> obj)
auto obj_id = obj->getId(); auto obj_id = obj->getId();
m_active_objects.put(obj_id, std::move(obj)); m_active_objects.put(obj_id, std::move(obj));
m_spatial_index.insert(pos.toArray(), obj_id); m_spatial_index.insert(pos.toArray(), obj_id);
assert(m_spatial_index.size() == m_active_objects.size());
auto new_size = m_active_objects.size(); auto new_size = m_active_objects.size();
verbosestream << "Server::ActiveObjectMgr::addActiveObjectRaw(): " verbosestream << "Server::ActiveObjectMgr::addActiveObjectRaw(): "

5
src/util/k_d_tree.h
View File

@ -418,7 +418,7 @@ class DynamicKdTrees {
trees.at(it->second.tree_idx).remove(it->second.in_tree); trees.at(it->second.tree_idx).remove(it->second.in_tree);
del_entries.erase(it); del_entries.erase(it);
++deleted; ++deleted;
if (deleted > n_entries/2) // "shift out" the last tree if (deleted >= (n_entries+1)/2) // "shift out" the last tree
shrink_to_half(); shrink_to_half();
} }
void update(const Point &newPos, Id id) { void update(const Point &newPos, Id id) {
@ -431,6 +431,9 @@ class DynamicKdTrees {
for (const auto &tree : trees) for (const auto &tree : trees)
tree.rangeQuery(min, max, cb); tree.rangeQuery(min, max, cb);
} }
Idx size() const {
return n_entries - deleted;
}
private: private:
void updateDelEntries(uint8_t tree_idx) { void updateDelEntries(uint8_t tree_idx) {
trees[tree_idx].foreach([&](Idx in_tree_idx, auto _, Id id) { trees[tree_idx].foreach([&](Idx in_tree_idx, auto _, Id id) {